Differential D726 Diff 1682 kexi/plugins/forms/kexiformview.cpp

Changeset View

Standalone View

View Options

kexi/plugins/forms/kexiformview.cpp

Context not available.
540 540​
541 if (viewMode() == Kexi::DataViewMode) { 541​ if (viewMode() == Kexi::DataViewMode) {
542//TMP!! 542​//TMP!!
543 initDataSource(); 543​ if (!initDataSource()) {
544​ return false;
545​ }
544 546​
545 //handle events for this form 547​ //handle events for this form
546 d->scrollView->setMainWidgetForEventHandling(d->dbform); 548​ d->scrollView->setMainWidgetForEventHandling(d->dbform);
Context not available.
596 return dynamic_cast<KexiFormPart*>(part()); 598​ return dynamic_cast<KexiFormPart*>(part());
597} 599​}
598 600​
599void KexiFormView::initDataSource() 601​bool KexiFormView::initDataSource()
600{ 602​{
601 deleteQuery(); 603​ deleteQuery();
604​ const QString dataSourceString(d->dbform->dataSource());
605​ if (dataSourceString.isEmpty()) {
606​ return true; // nothing to do
607​ }
608​
602//! @todo also handle anonymous (not stored) queries provided as statements here 609​//! @todo also handle anonymous (not stored) queries provided as statements here
603 KexiDB::TableSchema *tableSchema = 0; 610​ KexiDB::TableSchema *tableSchema = 0;
604 KexiDB::Connection *conn = 0; 611​ KexiDB::Connection *conn = 0;
605 QStringList sources; 612​ QStringList sources;
606 bool forceReadOnlyDataSource = false; 613​ bool forceReadOnlyDataSource = false;
607 QString dataSourceString(d->dbform->dataSource()); 614​ bool ok = true;
608 bool ok = !dataSourceString.isEmpty(); ​
609 if (ok) { 615​ if (ok) {
610 //collect all data-aware widgets and create query schema 616​ //collect all data-aware widgets and create query schema
611 d->scrollView->setMainDataSourceWidget(d->dbform); 617​ d->scrollView->setMainDataSourceWidget(d->dbform);
Context not available.
700 KexiUtils::WaitCursorRemover remover; 706​ KexiUtils::WaitCursorRemover remover;
701 params = KexiQueryParameters::getParameters(this, *conn->driver(), *d->query, ok); 707​ params = KexiQueryParameters::getParameters(this, *conn->driver(), *d->query, ok);
702 } 708​ }
703 if (ok) //input cancelled 709​ if (ok) { //input cancelled
704 d->cursor = conn->executeQuery(*d->query, params); 710​ d->cursor = conn->prepareQuery(*d->query, params);
711​ }
705 } 712​ }
706 d->scrollView->invalidateDataSources(invalidSources, d->query); 713​ d->scrollView->invalidateDataSources(invalidSources, d->query);
707 ok = d->cursor != 0; 714​ ok = d->cursor != 0;
715​ if (ok) {
716​ ok = setData(d->cursor);
717​ }
708 } 718​ }
709 719​
710 if (!invalidSources.isEmpty()) 720​ if (!invalidSources.isEmpty())
piggzUnsubmitted
Not Done

add some {} ?

piggz: add some {} ?
staniekAuthorUnsubmitted
Not Done

Yes, originally I did but decided to keep the patch minimal/ready to study for now.

staniek: Yes, originally I did but decided to keep the patch minimal/ready to study for now.
Context not available.
716 KexiDB::TableViewData* data = new KexiDB::TableViewData(d->cursor); 726​ KexiDB::TableViewData* data = new KexiDB::TableViewData(d->cursor);
717 if (forceReadOnlyDataSource) 727​ if (forceReadOnlyDataSource)
718 data->setReadOnly(true); 728​ data->setReadOnly(true);
719 data->preloadAllRows(); 729​ ok = data->preloadAllRows();
720 730​
721///*! @todo few backends return result count for free! - no need to reopen() */ 731​///*! @todo few backends return result count for free! - no need to reopen() */
722// int resultCount = -1; 732​// int resultCount = -1;
Context not available.
727// if (ok) 737​// if (ok)
728// ok = ! (!d->cursor->moveFirst() && d->cursor->error()); 738​// ok = ! (!d->cursor->moveFirst() && d->cursor->error());
729 739​
730 d->scrollView->setData(data, true /*owner*/); 740​ if (ok) {
741​ d->scrollView->setData(data, true /*owner*/);
742​ } else {
743​ delete data;
744​ }
731 } 745​ }
732 else { 746​ else {
733 d->scrollView->setData(0, false); 747​ d->scrollView->setData(0, false);
734 } 748​ }
749​ return ok;
735} 750​}
736 751​
737void KexiFormView::setFormModified() 752​void KexiFormView::setFormModified()
Context not available.