Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes mistype #105

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
+4 −4
Open

Fixes mistype #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3cba87e
Fixed mistype
EgorWeders Oct 15, 2024
e703e0e
Update qsql_ibase.cpp
EgorWeders Oct 15, 2024
ace3536
Merge branch 'qt:dev' into EgorWeders-mistype-fix
EgorWeders Oct 15, 2024
5c91058
Merge branch 'qt:dev' into EgorWeders-mistype-fix
EgorWeders Nov 19, 2024
ec03e14
Merge branch 'qt:dev' into EgorWeders-mistype-fix
EgorWeders Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/plugins/sqldrivers/ibase/qsql_ibase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -920,7 +920,7 @@ bool QIBaseResultPrivate::writeArray(qsizetype column, const QList<QVariant> &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 ||
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/sqldrivers/psql/qsql_psql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down