1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SQL/IBASE: Always escape the table names when creating the SQL statement

Browse Source 
Sync the IBASE driver behavior for primaryIndex() and record() with the
rest by assuming that the given table name has the correct casing.
Change the tests for these two function to pass an unescaped table name.

Change-Id: I6d96359f97e1acc6970b9a22fdf0e968a616b7bc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Christian Ehrlicher 2023-03-12 19:23:06 +01:00
parent f5aa8317d0
commit ca7e3bcf91
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/sqldrivers/ibase/qsql_ibase.cpp
View File

@ -1700,13 +1700,9 @@ QSqlRecord QIBaseDriver::record(const QString& tablename) const
if (!isOpen()) if (!isOpen())
return rec; return rec;
const QString table = stripDelimiters(tablename, QSqlDriver::TableName);
QSqlQuery q(createResult()); QSqlQuery q(createResult());
q.setForwardOnly(true); q.setForwardOnly(true);
QString table = tablename;
if (isIdentifierEscaped(table, QSqlDriver::TableName))
table = stripDelimiters(table, QSqlDriver::TableName);
else
table = table.toUpper();
q.exec("SELECT a.RDB$FIELD_NAME, b.RDB$FIELD_TYPE, b.RDB$FIELD_LENGTH, " q.exec("SELECT a.RDB$FIELD_NAME, b.RDB$FIELD_TYPE, b.RDB$FIELD_LENGTH, "
"b.RDB$FIELD_SCALE, b.RDB$FIELD_PRECISION, a.RDB$NULL_FLAG " "b.RDB$FIELD_SCALE, b.RDB$FIELD_PRECISION, a.RDB$NULL_FLAG "
"FROM RDB$RELATION_FIELDS a, RDB$FIELDS b " "FROM RDB$RELATION_FIELDS a, RDB$FIELDS b "
@ -1739,12 +1735,7 @@ QSqlIndex QIBaseDriver::primaryIndex(const QString &table) const
if (!isOpen()) if (!isOpen())
return index; return index;
QString tablename = table; const QString tablename = stripDelimiters(table, QSqlDriver::TableName);
if (isIdentifierEscaped(tablename, QSqlDriver::TableName))
tablename = stripDelimiters(tablename, QSqlDriver::TableName);
else
tablename = tablename.toUpper();
QSqlQuery q(createResult()); QSqlQuery q(createResult());
q.setForwardOnly(true); q.setForwardOnly(true);
q.exec("SELECT a.RDB$INDEX_NAME, b.RDB$FIELD_NAME, d.RDB$FIELD_TYPE, d.RDB$FIELD_SCALE " q.exec("SELECT a.RDB$INDEX_NAME, b.RDB$FIELD_NAME, d.RDB$FIELD_TYPE, d.RDB$FIELD_SCALE "

4
tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
View File

@ -112,7 +112,7 @@ void tst_QSqlDriver::record()
QSqlDatabase db = QSqlDatabase::database(dbName); QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db); CHECK_DATABASE(db);
QString tablename(qTableName("relTEST1", __FILE__, db)); QString tablename(qTableName("relTEST1", __FILE__, db, false));
QStringList fields; QStringList fields;
fields << "id" << "name" << "title_key" << "another_title_key" << "more_data"; fields << "id" << "name" << "title_key" << "another_title_key" << "more_data";
@ -171,7 +171,7 @@ void tst_QSqlDriver::primaryIndex()
QSqlDatabase db = QSqlDatabase::database(dbName); QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db); CHECK_DATABASE(db);
QString tablename(qTableName("relTEST1", __FILE__, db)); QString tablename(qTableName("relTEST1", __FILE__, db, false));
//check that we can get primary index using unquoted mixed case table name //check that we can get primary index using unquoted mixed case table name
QSqlIndex index = db.driver()->primaryIndex(tablename); QSqlIndex index = db.driver()->primaryIndex(tablename);
QCOMPARE(index.count(), 1); QCOMPARE(index.count(), 1);