From kde-commits  Wed May 16 08:43:53 2018
From: Jaroslaw Staniek <null () kde ! org>
Date: Wed, 16 May 2018 08:43:53 +0000
To: kde-commits
Subject: [kexi] src/plugins/reports: Merge remote-tracking branch 'origin/3.1'
Message-Id: <E1fIs2L-0005Me-GA () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=152646024314698

Git commit 3bd8fbc89f46fc2810ba0275e59bc0494b8b448c by Jaroslaw Staniek.
Committed on 16/05/2018 at 08:35.
Pushed by staniek into branch 'master'.

Merge remote-tracking branch 'origin/3.1'

# Conflicts:
#	src/plugins/reports/KexiDBReportDataSource.cpp
#	src/plugins/reports/krscriptfunctions.cpp

M  +53   -3    src/plugins/reports/KexiDBReportDataSource.cpp
M  +5    -5    src/plugins/reports/kexireportview.cpp

https://commits.kde.org/kexi/3bd8fbc89f46fc2810ba0275e59bc0494b8b448c

diff --cc src/plugins/reports/KexiDBReportDataSource.cpp
index d4144c704,fdeddbc47..2ecf03270
--- a/src/plugins/reports/KexiDBReportDataSource.cpp
+++ b/src/plugins/reports/KexiDBReportDataSource.cpp
@@@ -181,12 -182,12 +182,12 @@@ bool KexiDBReportDataSource::getSchema(
                  qDebug() << "Original: ERROR";
                  return false;
              }
 -            qDebug() << KDbConnectionAndQuerySchema(d->tempData->connecti=
on(), *d->originalSchema);
 -
 +            //qDebug() << KDbConnectionAndQuerySchema(d->tempData->connec=
tion(), *d->originalSchema);
              d->copySchema =3D new KDbQuerySchema(*d->originalSchema, d->t=
empData->connection());
 -            qDebug() << KDbConnectionAndQuerySchema(d->tempData->connecti=
on(), *d->copySchema);
 +            //qDebug() << KDbConnectionAndQuerySchema(d->tempData->connec=
tion(), *d->copySchema);
 +
-             if (builder.generateSelectStatement(&sql, d->copySchema)) {
-                 //qDebug() << "Copy:" << sql;
+             if (builder.generateSelectStatement(&d->schemaSql, d->copySch=
ema)) {
 -                qDebug() << "Copy:" << d->schemaSql;
++                //qDebug() << "Copy:" << d->schemaSql;
              } else {
                  qDebug() << "Copy: ERROR";
                  return false;
diff --cc src/plugins/reports/kexireportview.cpp
index 430205a43,aaee5c4f6..d692e8a5c
--- a/src/plugins/reports/kexireportview.cpp
+++ b/src/plugins/reports/kexireportview.cpp
@@@ -358,10 -356,9 +358,10 @@@ tristate KexiReportView::afterSwitchFro
          delete m_preRenderer;
  =

          //qDebug() << tempData()->reportDefinition.tagName();
 +
          m_preRenderer =3D new KReportPreRenderer(tempData()->reportDefini=
tion);
          if (m_preRenderer->isValid()) {
-             KReportDataSource *reportData =3D 0;
+             KexiDBReportDataSource *reportData =3D nullptr;
              if (!tempData()->connectionDefinition.isNull())  {
                  reportData =3D createDataSource(tempData()->connectionDef=
inition);
              }