[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kexi] src/plugins/reports: Merge remote-tracking branch 'origin/3.1'
From:       Adam Pigg <null () kde ! org>
Date:       2018-09-13 16:19:15
Message-ID: E1g0UKp-0007sO-Oz () code ! kde ! org
[Download RAW message or body]

Git commit c746a52256a5bf2503ca7a4ff7571b75f76f3a21 by Adam Pigg.
Committed on 13/09/2018 at 16:10.
Pushed by piggz into branch 'master'.

Merge remote-tracking branch 'origin/3.1'

M  +16   -4    src/plugins/reports/KexiDBReportDataSource.cpp

https://commits.kde.org/kexi/c746a52256a5bf2503ca7a4ff7571b75f76f3a21

diff --cc src/plugins/reports/KexiDBReportDataSource.cpp
index 2ecf03270,6d3d824a1..08f3a0c17
--- a/src/plugins/reports/KexiDBReportDataSource.cpp
+++ b/src/plugins/reports/KexiDBReportDataSource.cpp
@@@ -122,7 -125,14 +125,15 @@@ bool KexiDBReportDataSource::open(
          {
              //qDebug() << "Opening cursor.."
              //         << KDbConnectionAndQuerySchema(d->tempData->connection(), \
                *d->copySchema);
-             d->cursor = d->tempData->connection()->executeQuery(d->copySchema, \
KDbCursor::Option::Buffered); ++
+             bool ok;
+             KexiUtils::WaitCursorRemover remover;
+             d->currentParams = KexiQueryParameters::getParameters(0, \
d->tempData->connection(), d->originalSchema, &ok); +             if (!ok) {
+                 return false;
+             }
+ 
+             d->cursor = d->tempData->connection()->executeQuery(d->copySchema, \
d->currentParams, KDbCursor::Option::Buffered);  }
  
  
@@@ -176,18 -186,18 +187,19 @@@ bool KexiDBReportDataSource::getSchema(
          if (d->originalSchema) {
              const KDbNativeStatementBuilder builder(d->tempData->connection(), \
KDb::DriverEscaping);  KDbEscapedString sql;
-             if (builder.generateSelectStatement(&sql, d->originalSchema)) {
++
+             if (builder.generateSelectStatement(&sql, d->originalSchema, \
                d->currentParams)) {
 -                qDebug() << "Original:" << sql;
 +                //qDebug() << "Original:" << sql;
              } else {
                  qDebug() << "Original: ERROR";
                  return false;
              }
 -            qDebug() << KDbConnectionAndQuerySchema(d->tempData->connection(), \
                *d->originalSchema);
 -
 +            //qDebug() << KDbConnectionAndQuerySchema(d->tempData->connection(), \
                *d->originalSchema);
              d->copySchema = new KDbQuerySchema(*d->originalSchema, \
                d->tempData->connection());
-             //qDebug() << KDbConnectionAndQuerySchema(d->tempData->connection(), \
                *d->copySchema);
 -            qDebug() << KDbConnectionAndQuerySchema(d->tempData->connection(), \
*d->copySchema);  +
-             if (builder.generateSelectStatement(&d->schemaSql, d->copySchema)) {
++            //qDebug() << KDbConnectionAndQuerySchema(d->tempData->connection(), \
*d->copySchema); +             if (builder.generateSelectStatement(&d->schemaSql, \
                d->copySchema, d->currentParams)) {
 -                qDebug() << "Copy:" << d->schemaSql;
 +                //qDebug() << "Copy:" << d->schemaSql;
              } else {
                  qDebug() << "Copy: ERROR";
                  return false;


[prev in list] [next in list] [prev in thread] [next in thread]