From b1d6704b146c6ad8fd675a1cca3ab5e4e0e8b9c5 Mon Sep 17 00:00:00 2001 From: Emmanuel BOURGERIE Date: Wed, 27 Apr 2011 14:04:00 +1000 Subject: Fixed QTBUG-11935 Change-Id: Ia7bdb0ceecf2892f6be73d1816764a2bab6275f1 Merge-request: 1010 Reviewed-by: Charles Yin (cherry picked from commit a18f36048aa23fb088527c26274e49ce626ddf4d) --- src/sql/drivers/mysql/qsql_mysql.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/sql/drivers/mysql') diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index 49e7f138ee..37c3055ba1 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -1374,12 +1374,16 @@ QStringList QMYSQLDriver::tables(QSql::TableType type) const } else { QSqlQuery q(createResult()); if(type & QSql::Tables) { - q.exec(QLatin1String("select table_name from information_schema.tables where table_type = 'BASE TABLE'")); + QString sql = QLatin1String("select table_name from information_schema.tables where table_schema = ':schema' and table_type = 'BASE TABLE'"); + sql.replace(QLatin1String(":schema"), QLatin1String(d->mysql->db)); + q.exec(sql); while(q.next()) tl.append(q.value(0).toString()); } if(type & QSql::Views) { - q.exec(QLatin1String("select table_name from information_schema.tables where table_type = 'VIEW'")); + QString sql = QLatin1String("select table_name from information_schema.tables where table_schema = ':schema' and table_type = 'VIEW'"); + sql.replace(QLatin1String(":schema"), QLatin1String(d->mysql->db)); + q.exec(sql); while(q.next()) tl.append(q.value(0).toString()); } -- cgit v1.2.3