Branch 'oracle' - plugins/libkolab

Aleksander Machniak machniak at kolabsys.com
Wed Sep 17 18:06:57 CEST 2014


 plugins/libkolab/lib/kolab_storage_cache.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9e49c5c83bca4a2b18a490c54b6568bbaa9a4e8d
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Wed Sep 17 18:06:17 2014 +0200

    Quote also column aliases in sql tables, otherwise they will be returned uppercase in Oracle

diff --git a/plugins/libkolab/lib/kolab_storage_cache.php b/plugins/libkolab/lib/kolab_storage_cache.php
index c03554b..25b45ce 100644
--- a/plugins/libkolab/lib/kolab_storage_cache.php
+++ b/plugins/libkolab/lib/kolab_storage_cache.php
@@ -468,7 +468,7 @@ class kolab_storage_cache
 
             // fetch full object data on one query if a small result set is expected
             $fetchall = !$uids && ($this->limit ? $this->limit[0] : $this->count($query)) < 500;
-            $sql_query = "SELECT " . ($fetchall ? '*' : '`msguid` AS _msguid, `uid`') . " FROM `{$this->cache_table}` ".
+            $sql_query = "SELECT " . ($fetchall ? '*' : '`msguid` AS `_msguid`, `uid`') . " FROM `{$this->cache_table}` ".
                          "WHERE `folder_id` = ? " . $this->_sql_where($query);
             if (!empty($this->order_by)) {
                 $sql_query .= ' ORDER BY ' . $this->order_by;
@@ -551,7 +551,7 @@ class kolab_storage_cache
             $this->_read_folder_data();
 
             $sql_result = $this->db->query(
-                "SELECT COUNT(*) AS numrows FROM `{$this->cache_table}` ".
+                "SELECT COUNT(*) AS `numrows` FROM `{$this->cache_table}` ".
                 "WHERE `folder_id` = ?" . $this->_sql_where($query),
                 $this->folder_id
             );




More information about the commits mailing list