From 3cba87e5c6752d7941125c75cbaa76904aa9758d Mon Sep 17 00:00:00 2001 From: EgorWeders <157705588+EgorWeders@users.noreply.github.com> Date: Tue, 15 Oct 2024 14:38:40 +0700 Subject: [PATCH 1/2] Fixed mistype --- src/plugins/sqldrivers/psql/qsql_psql.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp index dfd1984a874..87901d25577 100644 --- a/src/plugins/sqldrivers/psql/qsql_psql.cpp +++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp @@ -205,7 +205,7 @@ bool QPSQLDriverPrivate::setSingleRowMode() const PGresult *QPSQLDriverPrivate::getResult(StatementId stmtId) const { - // Make sure the results of stmtId weren't discaded. This might + // Make sure the results of stmtId weren't discarded. This might // happen for forward-only queries if somebody executed another // SQL query on the same db connection. if (stmtId != currentStmtId) { From e703e0e8c7fd3d3c06afd965fc9efcad16af9d3f Mon Sep 17 00:00:00 2001 From: EgorWeders <157705588+EgorWeders@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:00:11 +0700 Subject: [PATCH 2/2] Update qsql_ibase.cpp --- src/plugins/sqldrivers/ibase/qsql_ibase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp index 09c55506341..df1347c9488 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp +++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp @@ -725,7 +725,7 @@ QVariant QIBaseResultPrivate::fetchArray(int pos, ISC_QUAD *arr) } ISC_LONG bufLen; - /* varying arrayelements are stored with 2 trailing null bytes + /* varying array elements are stored with 2 trailing null bytes indicating the length of the string */ if (desc.array_desc_dtype == blr_varying @@ -778,7 +778,7 @@ static char* qFillBufferWithString(char *buffer, const QString& string, short tmpBuflen = buflen; if (str.length() < buflen) buflen = str.length(); - if (array) { // interbase stores varying arrayelements different than normal varying elements + if (array) { // interbase stores varying array elements different than normal varying elements memcpy(buffer, str.constData(), buflen); memset(buffer + buflen, 0, tmpBuflen - buflen); } else { @@ -920,7 +920,7 @@ bool QIBaseResultPrivate::writeArray(qsizetype column, const QList &li desc.array_desc_bounds[i].array_bound_lower + 1); } - /* varying arrayelements are stored with 2 trailing null bytes + /* varying array elements are stored with 2 trailing null bytes indicating the length of the string */ if (desc.array_desc_dtype == blr_varying ||