Changeset 3742:00f9590175cb

Timestamp:

03/29/18 13:40:04 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Bugfix (ORDER BY clause needs to be after GROUP BY clause)

File:

• inc/core/class.dc.selectstatement.php (modified) (4 diffs)

inc/core/class.dc.selectstatement.php

@@ -351 +351 @@
      * @return dcSelectStatement self instance, enabling to chain calls
      */
-    public function distinct($distinct)
+    public function distinct($distinct = true)
     {
         $this->distinct = $distinct;
@@ -445 +445 @@
         }
 
+        // Group by clause (columns or aliases)
+        if (count($this->group)) {
+            $query .= 'GROUP BY ' . join(', ', $this->group) . ' ';
+        }
+
+        // Having clause(s)
+        if (count($this->having)) {
+            $query .= 'HAVING ' . join(' AND ', $this->having) . ' ';
+        }
+
         // Order by clause (columns or aliases and optionnaly order ASC/DESC)
         if (count($this->order)) {
@@ -450 +460 @@
         }
 
-        // Group by clause (columns or aliases)
-        if (count($this->group)) {
-            $query .= 'GROUP BY ' . join(', ', $this->group) . ' ';
-        }
-
-        // Having clause(s)
-        if (count($this->having)) {
-            $query .= 'HAVING ' . join(' AND ', $this->having) . ' ';
-        }
-
         // Limit clause
         if ($this->limit !== null) {
@@ -472 +472 @@
         return $query;
     }
+
+    /**
+     * Compare two SQL queries
+     *
+     * May be used for debugging purpose as:
+     * if (!$sql->isSame($sql->statement(), $oldRequest)) {
+     *    trigger_error('SQL statement error', E_USER_ERROR);
+     * }
+     *
+     * @param      string   $local     The local
+     * @param      string   $external  The external
+     *
+     * @return     boolean  True if same, False otherwise.
+     */
+    public function isSame($local, $external)
+    {
+        $filter = function ($s) {
+            $s = strtoupper($s);
+            $patterns = array(
+                '\s+' => ' ', // Multiple spaces/tabs -> one space
+                ' \)' => ')', // <space>) -> )
+                ' ,'  => ',', // <space>, -> ,
+                '\( ' => '(' // (<space> -> (
+            );
+            foreach ($patterns as $from => $to) {
+                $s = preg_replace('!' . $from . '!', $to, $s);
+            }
+            return $s;
+        };
+        return ($filter($local) !== $filter($external));
+    }
 }