Indefero Commit Details

Date:

2012-04-17 17:55:29 (13 years 6 months ago)

Author:

Thomas Keller

Branch:

develop, release-1.3

Commit:

d46df5c129145f630d94fed7da935da94d268a04

Parents:

316c57f85be30c862fa52b61c7a60e9aa3779ef2

Message:

Fix PostgreSQL compatibility issues.

Changes:

File differences

-
1
2
3
4
5
6
7
8
9
10
2 11
3 12
4 13
+# InDefero 1.3 - Sun Apr 15 21:10 2011 UTC␊
# InDefero 1.3.1 - xxx xxx xx xx:xx 2012 UTC␊
␊
## Bugfixes␊
␊
- Compatiblity fixes for PostgreSQL␊
␊
## Language and Translations␊
␊
␊
# InDefero 1.3 - Sun Apr 15 21:10 2012 UTC␊
␊
This new major release of Indefero is possible thanks to the sponsor of␊
[Scilab Enterprises](http://www.scilab-enterprises.com/).␊
-# InDefero 1.3 - Sun Apr 15 21:10 2011 UTC␊
+# InDefero 1.3.1 - xxx xxx xx xx:xx 2012 UTC␊
+␊
+## Bugfixes␊
+␊
+- Compatiblity fixes for PostgreSQL␊
+␊
+## Language and Translations␊
+␊
+␊
+# InDefero 1.3 - Sun Apr 15 21:10 2012 UTC␊
 ␊
 This new major release of Indefero is possible thanks to the sponsor of␊
 [Scilab Enterprises](http://www.scilab-enterprises.com/).␊

-115
116 116
117 117
118 
119 
118
120 119
121 120
122 121
+                array(␊
                    'join' => 'LEFT JOIN '.$activityTable.' ON current_activity='.$activityTable.'.id '␊
                             .'LEFT JOIN '.$tagTable.' ON idf_project_id='.$this->getSqlTable().'.id',␊
                    'select' => $this->getSelect().', date, value',␊
                    'group' => $this->getSqlTable().'.id',␊
                    'select' => 'DISTINCT '.$this->getSelect().', date, value',␊
                    'props' => array(␊
                        'date' => 'current_activity_date',␊
                        'value' => 'current_activity_value'␊
                 array(␊
                     'join' => 'LEFT JOIN '.$activityTable.' ON current_activity='.$activityTable.'.id '␊
                              .'LEFT JOIN '.$tagTable.' ON idf_project_id='.$this->getSqlTable().'.id',␊
-                    'select' => $this->getSelect().', date, value',␊
-                    'group' => $this->getSqlTable().'.id',␊
+                    'select' => 'DISTINCT '.$this->getSelect().', date, value',␊
                     'props' => array(␊
                         'date' => 'current_activity_date',␊
                         'value' => 'current_activity_value'␊

-382
383 383
384 384
385 
385
386 386
387 387
388 388
+    {␊
        $db =& Pluf::db();␊
        $false = Pluf_DB_BooleanToDb(false, $db);␊
        $sql = new Pluf_SQL(1);␊
        $sql = new Pluf_SQL('1=1');␊
        if ($tag !== false) {␊
            $sql->SAnd(new Pluf_SQL('idf_tag_id=%s', $tag->id));␊
        }␊
     {␊
         $db =& Pluf::db();␊
         $false = Pluf_DB_BooleanToDb(false, $db);␊
-        $sql = new Pluf_SQL(1);␊
+        $sql = new Pluf_SQL('1=1');␊
         if ($tag !== false) {␊
             $sql->SAnd(new Pluf_SQL('idf_tag_id=%s', $tag->id));␊
         }␊