From 3ce4f0a83939a26c74ec990ae66af6a03ea216d6 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 29 Apr 2014 06:29:11 -0400
Subject: [PATCH] Revert [78a58162], TABLE_SCHEMA column does not exist in mysql, also tables in postgres can be in 'public' schema.
---
program/lib/Roundcube/rcube_db.php | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/program/lib/Roundcube/rcube_db.php b/program/lib/Roundcube/rcube_db.php
index 29f125d..a46df97 100644
--- a/program/lib/Roundcube/rcube_db.php
+++ b/program/lib/Roundcube/rcube_db.php
@@ -611,8 +611,7 @@
{
// get tables if not cached
if ($this->tables === null) {
- $q = $this->query('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = ? ORDER BY TABLE_NAME',
- array($this->db_dsnw_array['database']));
+ $q = $this->query('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES ORDER BY TABLE_NAME');
if ($q) {
$this->tables = $q->fetchAll(PDO::FETCH_COLUMN, 0);
@@ -634,8 +633,8 @@
*/
public function list_cols($table)
{
- $q = $this->query('SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ? AND TABLE_SCHEMA = ?',
- array($table, $this->db_dsnw_array['database']));
+ $q = $this->query('SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ?',
+ array($table));
if ($q) {
return $q->fetchAll(PDO::FETCH_COLUMN, 0);
--
Gitblit v1.9.1