Changeset 2999:7a766509c5aa

Timestamp:

04/22/15 11:57:45 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

committer:

Nicolas <nikrou77@gmail.com> 1429696695 -7200

Message:

Fix #2087 - Ambiguous column name for SQLite

Files:

• .atoum.coverage.php (added)
• .atoum.php (added)
• Makefile (modified) (1 diff)
• inc/core/class.dc.core.php (modified) (1 diff)
• tests/unit/bootstrap.php (added)
• tests/unit/inc/core/class.dc.core.php (added)

Makefile

@@ -22 +22 @@
             ./$(DC)/inc/libs/clearbricks/.atoum.* ./$(DC)/inc/libs/clearbricks/vendor     \
             ./$(DC)/inc/libs/clearbricks/bin ./$(DC)/inc/libs/clearbricks/_dist      \
+            ./$(DC)/.atoum.* ./$(DC)/test ./$(DC)/travis                        \
             ./$(DC)/features ./$(DC)/travis ./$(DC)/behat.yml.dist ./$(DC)/composer.*
 

inc/core/class.dc.core.php

@@ -573 +573 @@
 
                if (!empty($params['order']) && !$count_only) {
-                    $strReq .= 'ORDER BY '.$this->con->escape($params['order']).' ';
+                    if (preg_match('`^([^. ]+) (?:asc|desc)`i',$params['order'],$matches)) {
+                         if (in_array($matches[1],array('user_id','user_name','user_firstname','user_displayname'))) {
+                              $table_prefix = 'U';
+                         } else {
+                              $table_prefix = 'P'; // order = nb_post (asc|desc)
+                         }
+                         $strReq .= 'ORDER BY '.$table_prefix.'.'.$this->con->escape($params['order']).' ';
+                    } else {
+                         $strReq .= 'ORDER BY '.$this->con->escape($params['order']).' ';
+                    }
                } else {
                     $strReq .= 'ORDER BY U.user_id ASC ';