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

List:       kde-commits
Subject:    [kexi/3.1] src/plugins/reports: Move asking for paramters to open() instead of getSchema()
From:       Adam Pigg <null () kde ! org>
Date:       2018-09-13 16:01:47
Message-ID: E1g0U3v-000496-8i () code ! kde ! org
[Download RAW message or body]

Git commit 02dd7b6c47fce53385163d8d00311bbe8b44c26e by Adam Pigg.
Committed on 12/09/2018 at 20:10.
Pushed by piggz into branch '3.1'.

Move asking for paramters to open() instead of getSchema()

M  +7    -7    src/plugins/reports/KexiDBReportDataSource.cpp

https://commits.kde.org/kexi/02dd7b6c47fce53385163d8d00311bbe8b44c26e

diff --git a/src/plugins/reports/KexiDBReportDataSource.cpp \
b/src/plugins/reports/KexiDBReportDataSource.cpp index 0ca76bd30..6d3d824a1 100644
--- a/src/plugins/reports/KexiDBReportDataSource.cpp
+++ b/src/plugins/reports/KexiDBReportDataSource.cpp
@@ -125,6 +125,13 @@ bool KexiDBReportDataSource::open()
         {
             //qDebug() << "Opening cursor.."
             //         << KDbConnectionAndQuerySchema(d->tempData->connection(), \
*d->copySchema); +            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);  }
 
@@ -174,13 +181,6 @@ bool KexiDBReportDataSource::getSchema(const QString& pluginId)
             qDebug() << d->objectName <<  "is a query..";
             qDebug() << KDbConnectionAndQuerySchema(d->tempData->connection(), \
                *query);
             d->originalSchema = new KDbQuerySchema(*query, \
                d->tempData->connection());
-
-            bool ok;
-            KexiUtils::WaitCursorRemover remover;
-            d->currentParams = KexiQueryParameters::getParameters(0, \
                d->tempData->connection(), d->originalSchema, &ok);
-            if (!ok) {
-                return false;
-            }
         }
 
         if (d->originalSchema) {


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