[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: Jaroslaw Staniek <null () kde ! org>
Date: 2018-05-16 8:43:53
Message-ID: E1fIs2L-0005Me-GA () code ! kde ! org
[Download RAW message or body]
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->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(&sql, d->copySchema)) {
- //qDebug() << "Copy:" << sql;
+ if (builder.generateSelectStatement(&d->schemaSql, d->copySchema)) {
- 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 = new KReportPreRenderer(tempData()->reportDefinition);
if (m_preRenderer->isValid()) {
- KReportDataSource *reportData = 0;
+ KexiDBReportDataSource *reportData = nullptr;
if (!tempData()->connectionDefinition.isNull()) {
reportData = createDataSource(tempData()->connectionDefinition);
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic