[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kexi/plugins/queries
From: Jaroslaw Staniek <js () iidea ! pl>
Date: 2004-11-13 0:44:05
Message-ID: 20041113004405.68E0716D7F () office ! kde ! org
[Download RAW message or body]
CVS commit by staniek:
typo
M +9 -6 kexiquerydesignerguieditor.cpp 1.96
M +1 -1 kexiquerydesignerguieditor.h 1.51
M +5 -1 kexiquerydesignersql.cpp 1.37
--- koffice/kexi/plugins/queries/kexiquerydesignerguieditor.cpp #1.95:1.96
@@ -223,8 +223,8 @@ void KexiQueryDesignerGuiEditor::initTab
d->dataTable->tableView()->setData(d->data);
- updateColumsData();
+ updateColumnsData();
}
-void KexiQueryDesignerGuiEditor::updateColumsData()
+void KexiQueryDesignerGuiEditor::updateColumnsData()
{
d->dataTable->tableView()->acceptRowEdit();
@@ -574,5 +574,5 @@ void KexiQueryDesignerGuiEditor::showTab
d->slotTableAdded_enabled = true;
- updateColumsData();
+ updateColumnsData();
}
@@ -681,5 +681,8 @@ bool KexiQueryDesignerGuiEditor::storeLa
{
KexiQueryPart::TempData * temp = tempData();
- QString sqlText = mainWin()->project()->dbConnection()->selectStatement( *temp->query );
+
+ // Save SQL without driver-escaped keywords.
+ QString sqlText =
+ mainWin()->project()->dbConnection()->selectStatement( *temp->query, false );
if (!storeDataBlock( sqlText, "sql" )) {
return false;
@@ -794,5 +797,5 @@ void KexiQueryDesignerGuiEditor::slotTab
if (!d->slotTableAdded_enabled)
return;
- updateColumsData();
+ updateColumnsData();
setDirty();
}
@@ -800,5 +803,5 @@ void KexiQueryDesignerGuiEditor::slotTab
void KexiQueryDesignerGuiEditor::slotTableHidden(KexiDB::TableSchema & /*t*/)
{
- updateColumsData();
+ updateColumnsData();
setDirty();
}
--- koffice/kexi/plugins/queries/kexiquerydesignerguieditor.h #1.50:1.51
@@ -84,5 +84,5 @@ class KexiQueryDesignerGuiEditor : publi
/*! Updates data in columns depending on tables that are currently inserted.
Tabular Data in combo box popups is updated as well. */
- void updateColumsData();
+ void updateColumnsData();
/*! \return property buffer associated with currently selected row (i.e. field)
--- koffice/kexi/plugins/queries/kexiquerydesignersql.cpp #1.36:1.37
@@ -30,4 +30,5 @@
#include <kexi_utils.h>
+#include <kexidb/driver.h>
#include <kexidb/connection.h>
#include <kexidb/parser/parser.h>
@@ -283,5 +284,8 @@ KexiQueryDesignerSQLView::afterSwitchFro
}
else {
- d->origStatement = mainWin()->project()->dbConnection()->selectStatement( *query ).stripWhiteSpace();
+ // Use query with Kexi keywords (but not driver-specific keywords) escaped.
+ KexiDB::Connection* conn = mainWin()->project()->dbConnection();
+ int flags = KexiDB::Driver::EscapeKexi;
+ d->origStatement = conn->selectStatement(*query, flags).stripWhiteSpace();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic