mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Fix subquery loading

Browse Source
This commit is contained in:
Arin Alexander 2017-03-03 00:55:35 +03:00
parent ae96864efa
commit 9ab3cb5803
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
limereport/lrdatasourcemanager.cpp
View File

@ -856,7 +856,7 @@ QList<QString> DataSourceManager::childDatasources(const QString &parentDatasour
foreach(QString datasourceName, dataSourceNames()){ foreach(QString datasourceName, dataSourceNames()){
if (isSubQuery(datasourceName)){ if (isSubQuery(datasourceName)){
SubQueryHolder* sh = dynamic_cast<SubQueryHolder*>(dataSourceHolder(datasourceName)); SubQueryHolder* sh = dynamic_cast<SubQueryHolder*>(dataSourceHolder(datasourceName));
if (sh->masterDatasource().compare(parentDatasourceName,Qt::CaseInsensitive)==0){ if (sh && sh->masterDatasource().compare(parentDatasourceName,Qt::CaseInsensitive)==0){
result.append(datasourceName); result.append(datasourceName);
} }
} }
@ -868,6 +868,7 @@ void DataSourceManager::invalidateChildren(const QString &parentDatasourceName)
{ {
foreach(QString datasourceName, childDatasources(parentDatasourceName)){ foreach(QString datasourceName, childDatasources(parentDatasourceName)){
SubQueryHolder* sh = dynamic_cast<SubQueryHolder*>(dataSourceHolder(datasourceName)); SubQueryHolder* sh = dynamic_cast<SubQueryHolder*>(dataSourceHolder(datasourceName));
if (sh)
sh->invalidate(designTime()?IDataSource::DESIGN_MODE:IDataSource::RENDER_MODE); sh->invalidate(designTime()?IDataSource::DESIGN_MODE:IDataSource::RENDER_MODE);
invalidateChildren(datasourceName); invalidateChildren(datasourceName);
} }
@ -1110,7 +1111,12 @@ void DataSourceManager::collectionLoadFinished(const QString &collectionName)
if (!m_datasources.contains(it.value()->queryName().toLower())){ if (!m_datasources.contains(it.value()->queryName().toLower())){
connect(it.value(), SIGNAL(queryTextChanged(QString,QString)), connect(it.value(), SIGNAL(queryTextChanged(QString,QString)),
this, SLOT(slotQueryTextChanged(QString,QString))); this, SLOT(slotQueryTextChanged(QString,QString)));
putHolder(it.value()->queryName(),new QueryHolder(it.value()->queryText(), it.value()->connectionName(), this)); putHolder(it.value()->queryName(),new SubQueryHolder(
it.value()->queryText(),
it.value()->connectionName(),
it.value()->master(),
this)
);
} else { } else {
delete it.value(); delete it.value();
it.remove(); it.remove();