From kde-commits  Tue Oct 16 20:47:01 2007
From: Jaroslaw Staniek <js () iidea ! pl>
Date: Tue, 16 Oct 2007 20:47:01 +0000
To: kde-commits
Subject: koffice/kexi/plugins/queries
Message-Id: <1192567621.046071.3170.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=119256763015956

SVN commit 726005 by staniek:

Query Designer
- fixed regression in loading condition info
 


 M  +7 -4      kexiquerydesignerguieditor.cpp  
 M  +0 -1      kexiquerypart.cpp  


--- trunk/koffice/kexi/plugins/queries/kexiquerydesignerguieditor.cpp #726004:726005
@@ -873,12 +873,12 @@
 			else if (binary->left()->toVariable()) {
 				//this is: variable , op , argument
 				//store variable -> argument:
-				criterias.insert(binary->left()->toVariable()->name, binary->right());
+				criterias.insertMulti(binary->left()->toVariable()->name, binary->right());
 			}
 			else if (binary->right()->toVariable()) {
 				//this is: argument , op , variable
 				//store variable -> argument:
-				criterias.insert(binary->right()->toVariable()->name, binary->left());
+				criterias.insertMulti(binary->right()->toVariable()->name, binary->left());
 			}
 		}
 	} //while
@@ -887,12 +887,14 @@
 		return;
 
 	//3. show fields (including * and table.*)
-	uint row_num = -1;
+	uint row_num = 0;
 	QSet<KexiDB::BaseExpr*> usedCriterias; // <-- used criterias will be saved here
                                             //     so in step 4. we will be able to add 
 	                                        //     remaining invisible columns with criterias
+	query->debug();
+	foreach (KexiDB::Field* field, *query->fields())
+		field->debug();
 	foreach (KexiDB::Field* field, *query->fields()) {
-		row_num++;
 		//append a new row
 		QString tableName, fieldName, columnAlias, criteriaString;
 		KexiDB::BinaryExpr *criteriaExpr = 0;
@@ -954,6 +956,7 @@
 					QVariant(columnAlias + ": " + field->expression()->toString()), &result))
 				return; //problems with setting column expression
 		}
+		row_num++;
 	}
 
 	//4. show ORDER BY information
--- trunk/koffice/kexi/plugins/queries/kexiquerypart.cpp #726004:726005
@@ -200,7 +200,6 @@
 
 KLocalizedString KexiQueryPart::i18nMessage(const QString& englishMessage, KexiWindow* window) const
 {
-	Q_UNUSED(window);
 	if (englishMessage=="Design of object \"%1\" has been modified.")
 		return ki18n(I18N_NOOP("Design of query \"%1\" has been modified."));
 	if (englishMessage=="Object \"%1\" already exists.")