equal
deleted
inserted
replaced
257 return result; |
257 return result; |
258 } |
258 } |
259 |
259 |
260 static QString qODBCWarn(const QODBCPrivate* odbc, int *nativeCode = 0) |
260 static QString qODBCWarn(const QODBCPrivate* odbc, int *nativeCode = 0) |
261 { |
261 { |
262 return (qWarnODBCHandle(SQL_HANDLE_ENV, odbc->dpEnv()) + QLatin1Char(' ') |
262 return QString(qWarnODBCHandle(SQL_HANDLE_ENV, odbc->dpEnv()) + QLatin1Char(' ') |
263 + qWarnODBCHandle(SQL_HANDLE_DBC, odbc->dpDbc()) + QLatin1Char(' ') |
263 + qWarnODBCHandle(SQL_HANDLE_DBC, odbc->dpDbc()) + QLatin1Char(' ') |
264 + qWarnODBCHandle(SQL_HANDLE_STMT, odbc->hStmt, nativeCode)).simplified(); |
264 + qWarnODBCHandle(SQL_HANDLE_STMT, odbc->hStmt, nativeCode)).simplified(); |
265 } |
265 } |
266 |
266 |
267 static QString qODBCWarn(const QODBCDriverPrivate* odbc, int *nativeCode = 0) |
267 static QString qODBCWarn(const QODBCDriverPrivate* odbc, int *nativeCode = 0) |
268 { |
268 { |
269 return (qWarnODBCHandle(SQL_HANDLE_ENV, odbc->hEnv) + QLatin1Char(' ') |
269 return QString(qWarnODBCHandle(SQL_HANDLE_ENV, odbc->hEnv) + QLatin1Char(' ') |
270 + qWarnODBCHandle(SQL_HANDLE_DBC, odbc->hDbc, nativeCode)).simplified(); |
270 + qWarnODBCHandle(SQL_HANDLE_DBC, odbc->hDbc, nativeCode)).simplified(); |
271 } |
271 } |
272 |
272 |
273 static void qSqlWarning(const QString& message, const QODBCPrivate* odbc) |
273 static void qSqlWarning(const QString& message, const QODBCPrivate* odbc) |
274 { |
274 { |