Changeset 43096

Timestamp:

Sep 22, 2026, 3:10:37 PM (41 hours ago)

Author:

eugene

Message:

SELECT DISTINCT with UNION needs grouping parentheses in modern SQL

Location:

branches/eam_branches/ipp-pstamp-20260421/ippTools

Files:

• share/difftool_pendingcleanuprun.sql (modified) (5 diffs)
• src/difftool.c (modified) (1 diff)

branches/eam_branches/ipp-pstamp-20260421/ippTools/share/difftool_pendingcleanuprun.sql

@@ -1 +1 @@
 -- does this result in too many entries (one for each diffInputSkyfile?)
 -- all of this is just to get the camera used for the diff run
-SELECT DISTINCT * FROM 
-   (SELECT DISTINCT
+SELECT * FROM 
+   ((SELECT DISTINCT
             diffRun.diff_id,
             rawExp.camera,
@@ -31 +31 @@
              diffRun.state = 'goto_scrubbed' OR 
              diffRun.state = 'goto_purged')
-        @INNERLIMITS@
+        @INNERLIMITS@)
      UNION
-     SELECT DISTINCT
+     (SELECT DISTINCT
             diffRun.diff_id,
             rawExp.camera,
@@ -62 +62 @@
              diffRun.state = 'goto_scrubbed' OR 
              diffRun.state = 'goto_purged')
-        @INNERLIMITS@
+        @INNERLIMITS@)
      UNION
-     SELECT DISTINCT 
+     (SELECT DISTINCT 
             diffRun.diff_id,
             rawExp.camera,
@@ -93 +93 @@
              diffRun.state = 'goto_scrubbed' OR 
              diffRun.state = 'goto_purged')
-        @INNERLIMITS@
+        @INNERLIMITS@)
      UNION
-     SELECT DISTINCT
+     (SELECT DISTINCT
             diffRun.diff_id,
             rawExp.camera,
@@ -124 +124 @@
              diffRun.state = 'goto_scrubbed' OR 
              diffRun.state = 'goto_purged')
-        @INNERLIMITS@
+        @INNERLIMITS@)
         ) as Foo
         WHERE 1

branches/eam_branches/ipp-pstamp-20260421/ippTools/src/difftool.c

@@ -2883 +2883 @@
     if (limit) {
         psString limitString = psDBGenerateLimitSQL(limit);
-        psStringAppend(&query, " %s", limitString);
-        psStringSubstitute(&query,limitString,"@INNERLIMITS@");
+        // psStringAppend(&query, " %s", limitString);
+        psStringSubstitute(&query, limitString, "@INNERLIMITS@");
         psFree(limitString);
 
     }
     else {
-      psStringSubstitute(&query,NULL,"@INNERLIMITS@");
+      psStringSubstitute(&query ,NULL, "@INNERLIMITS@");
     }
     //    fprintf(stderr,"%s",query);