summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
authorEmmanuel BOURGERIE <manu.dwarf@gmail.com>2011-04-27 04:04:02 (GMT)
committerCharles Yin <charles.yin@nokia.com>2011-04-27 04:55:22 (GMT)
commitc0ca29efdeb442a6b88ccadff409e3f7ef828ce8 (patch)
treee063c41c7b886a8639dbcbac54b8d18578eaf81c /src/sql
parenta18f36048aa23fb088527c26274e49ce626ddf4d (diff)
downloadQt-c0ca29efdeb442a6b88ccadff409e3f7ef828ce8.zip
Qt-c0ca29efdeb442a6b88ccadff409e3f7ef828ce8.tar.gz
Qt-c0ca29efdeb442a6b88ccadff409e3f7ef828ce8.tar.bz2
Fixed QTBUG-11935 : "With MySQL version > 50000 the QMYSQLDriver::
tables() returns tables in all databases on the server" This bugfix has been rewritten to match contributors advise. Change-Id: I3a9cf900ff7eae47c9ffdbcf34bcb1b4396d9837 Merge-request: 1010 Reviewed-by: Charles Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/drivers/mysql/qsql_mysql.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 2a969ee..441e355 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -1374,16 +1374,16 @@ QStringList QMYSQLDriver::tables(QSql::TableType type) const
} else {
QSqlQuery q(createResult());
if(type & QSql::Tables) {
- 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));
+ QString sql = QLatin1String("select table_name from information_schema.tables where table_schema = '") + QLatin1String(d->mysql->db) + QLatin1String("' and table_type = 'BASE TABLE'");
q.exec(sql);
+
while(q.next())
tl.append(q.value(0).toString());
}
if(type & QSql::Views) {
- 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));
+ QString sql = QLatin1String("select table_name from information_schema.tables where table_schema = '") + QLatin1String(d->mysql->db) + QLatin1String("' and table_type = 'VIEW'");
q.exec(sql);
+
while(q.next())
tl.append(q.value(0).toString());
}