From kde-commits  Thu Apr 05 11:06:29 2007
From: Jaroslaw Staniek <js () iidea ! pl>
Date: Thu, 05 Apr 2007 11:06:29 +0000
To: kde-commits
Subject: koffice/kexi/plugins/queries
Message-Id: <1175771189.102333.31293.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=117577098406960

SVN commit 650737 by staniek:

Query Designer
- fixed table sizes in the Design View
- fixed displaying relation connection lines when connected field is
   not visible
- fixed mouse drop position when target points on a field of table with
  scrolled-down contents
- do not show internal relationships for visible lookup fields (JOINs)
   in SQL view
- removed possible crash in data view

2.0: merged


 M  +1 -0      kexiquerydesignerguieditor.cpp  
 M  +2 -1      kexiquerydesignersql.cpp  
 M  +2 -2      kexiquerypartinstui.rc  
 M  +4 -1      kexiqueryview.cpp  


--- trunk/koffice/kexi/plugins/queries/kexiquerydesignerguieditor.cpp #650736:650737
@@ -1146,6 +1146,7 @@
 
 	KexiDB::Connection::SelectStatementOptions options;
 	options.identifierEscaping = KexiDB::Driver::EscapeKexi|KexiDB::Driver::EscapeAsNecessary;
+	options.addVisibleLookupColumns = false;
 	QString sqlText = dbConn->selectStatement( *temp->query(), options );
 	if (!storeDataBlock( sqlText, "sql" )) {
 		return false;
--- trunk/koffice/kexi/plugins/queries/kexiquerydesignersql.cpp #650736:650737
@@ -248,7 +248,7 @@
 				//this view is no longer _just_ switched from "NoViewMode"
 				d->justSwitchedFromNoViewMode = false;
 				//replace old query schema with new one
-				temp->setQuery( d->parsedQuery ); //this wil also delete temp->query()
+				temp->setQuery( d->parsedQuery ); //this will also delete temp->query()
 //				delete temp->query; //safe?
 //				temp->query = d->parsedQuery;
 				d->parsedQuery = 0;
@@ -313,6 +313,7 @@
 		KexiDB::Connection* conn = mainWin()->project()->dbConnection();
 		KexiDB::Connection::SelectStatementOptions options;
 		options.identifierEscaping = KexiDB::Driver::EscapeKexi;
+		options.addVisibleLookupColumns = false;
 		d->origStatement = conn->selectStatement(*query, options).trimmed();
 	}
 
--- trunk/koffice/kexi/plugins/queries/kexiquerypartinstui.rc #650736:650737
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="kexiquerypartinst" version="3">
+<kpartgui name="kexiquerypartinst" version="4">
 
 <MenuBar>
   <Menu name="view" noMerge="1">
@@ -14,7 +14,7 @@
   </Menu>
 </MenuBar>
 
-<ToolBar name="design" fullWidth="false" noMerge="0">
+<ToolBar name="designToolBar" fullWidth="false" noMerge="0">
   <text>Design</text>
   <Action name="querypart_check_query"/>
   <Action name="querypart_execute_query"/>
--- trunk/koffice/kexi/plugins/queries/kexiqueryview.cpp #650736:650737
@@ -96,8 +96,11 @@
 	if (oldCursor)
 		oldCursor->connection()->deleteCursor(oldCursor);
 
-	//TODO: maybe allow writing and inserting for single-table relations?
+//! @todo maybe allow writing and inserting for single-table relations?
 	tableView()->setReadOnly( true );
+//! @todo maybe allow writing and inserting for single-table relations?
+	//set data model itself read-only too
+	tableView()->data()->setReadOnly( true );
 	tableView()->setInsertingEnabled( false );
 	return true;
 }