Changeset 25840 for trunk/ippTools/src/pxtools.c

Timestamp:

Oct 14, 2009, 12:22:54 PM (17 years ago)

Author:

bills

Message:

pass name of table to pxUpdateRun to disambiguate values in the joined tables.
fix a couple of other little problems

File:

• trunk/ippTools/src/pxtools.c (modified) (2 diffs)

trunk/ippTools/src/pxtools.c

@@ -110 +110 @@
 
 // shared code for updating the various strings for a Run
-bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, bool has_dist_group)
+bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString table, bool has_dist_group)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -150 +150 @@
     char *comma = ",";
 
-#   define addColumn(_val) \
+#   define addColumn(_tab, _val) \
         do { \
             if (_val) { \
-                psStringAppend(pQuery, "%s %s = '%s'", separator, #_val, _val); \
+                psStringAppend(pQuery, "%s %s.%s = '%s'", separator, _tab, #_val, _val); \
                 separator = comma; \
             } \
         } while (0)
 
-    addColumn(state);
-    addColumn(data_group);
+    addColumn(table, state);
+    addColumn(table, data_group);
     if (has_dist_group) {
-        addColumn(dist_group);
+        addColumn(table, dist_group);
     }
-    addColumn(note);
-    addColumn(label);
+    addColumn(table, note);
+    addColumn(table, label);
 
     psString whereClause =  psDBGenerateWhereSQL(where, NULL);