Changeset 3456 in subversion for trunk/roundcubemail/program/include/rcube_mdb2.php

Timestamp:

Apr 1, 2010 2:25:29 AM (3 years ago)

Author:

alec

Message:

• Use MDB2's Manager module for listing tables

File:

• trunk/roundcubemail/program/include/rcube_mdb2.php (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_mdb2.php

@@ -405 +405 @@
     // get tables if not cached
     if (!$this->tables) {
-      $this->tables = array();
-
-      switch ($this->db_provider) {
-        case 'sqlite':
-          $result = $this->db_handle->query("SELECT name FROM sqlite_master WHERE type='table'");
-          break;
-        default:
-          $result = $this->db_handle->query("SHOW TABLES");
-      }
-
-      if ($result !== false && !PEAR::isError($result))
-        while ($rec = $result->fetchRow(MDB2_FETCHMODE_ORDERED))
-          $this->tables[] = $rec[0];
+      $this->db_handle->loadModule('Manager');
+      if (!PEAR::isError($result = $this->db_handle->listTables()))
+        $this->tables = $result;
+      else
+        $this->tables = array();
     }