Re: [PATCH] [REVIEW:3-5] fdo#46843 graphical query editor loses sorting order

2012-03-19 Thread Petr Mladek
Lionel Elie Mamane píše v Čt 15. 03. 2012 v 18:53 +0100:
 Attached patch fixes fdo#46843, namely that the graphical query editor
 loses the query's sorting order. (most annoying, severity critical)
 
 Culprit:
 
 commit 33b9b857ea6cb5a6f731de68f58e532242c43d30
 Author: Ocke Janssen [oj] ocke.jans...@oracle.com
 Date:   Tue Jan 4 13:12:33 2011 +0100
 
 dba34c: #i20306# support for window function and limit fetch first, ... 
 added
 
 Which pushed the order by clause from fourth to fifth position in
 table_exp rule of connectivity/source/parse/sqlbison.y

Hmm, both queries are sorted by name. The first query should be sorted
by job.

It works better, definitely. I wonder if there is one more bug or if it
needs another values instead of the hardcoded 4.

Lionel, any idea here?


Best Regards,
Petr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [PATCH] [REVIEW:3-5] fdo#46843 graphical query editor loses sorting order

2012-03-19 Thread Lionel Elie Mamane
On Mon, Mar 19, 2012 at 04:31:34PM +0100, Petr Mladek wrote:
 Lionel Elie Mamane píše v Čt 15. 03. 2012 v 18:53 +0100:

 Attached patch fixes fdo#46843, namely that the graphical query editor
 loses the query's sorting order. (most annoying, severity critical)

 Culprit:

 commit 33b9b857ea6cb5a6f731de68f58e532242c43d30
 Author: Ocke Janssen [oj] ocke.jans...@oracle.com
 Date:   Tue Jan 4 13:12:33 2011 +0100

 dba34c: #i20306# support for window function and limit fetch first, ... 
 added

 Which pushed the order by clause from fourth to fifth position in
 table_exp rule of connectivity/source/parse/sqlbison.

 Hmm, both queries are sorted by name. The first query should be sorted
 by job.

 It works better, definitely. I wonder if there is one more bug or if it
 needs another values instead of the hardcoded 4.

Yes, there is one more bug, filed as fdo#47370. I'm working on it. Ah,
I should make it most annoying, forgot to do that. Doing now.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] [REVIEW:3-5] fdo#46843 graphical query editor loses sorting order

2012-03-15 Thread Lionel Elie Mamane
Attached patch fixes fdo#46843, namely that the graphical query editor
loses the query's sorting order. (most annoying, severity critical)

Culprit:

commit 33b9b857ea6cb5a6f731de68f58e532242c43d30
Author: Ocke Janssen [oj] ocke.jans...@oracle.com
Date:   Tue Jan 4 13:12:33 2011 +0100

dba34c: #i20306# support for window function and limit fetch first, ... 
added

Which pushed the order by clause from fourth to fifth position in
table_exp rule of connectivity/source/parse/sqlbison.y

Please apply to libreoffice-3-5.

-- 
Lionel
From 80c235510aeb19d4df6a07be7499e70122313bbf Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane lio...@mamane.lu
Date: Thu, 15 Mar 2012 11:22:32 +0100
Subject: [PATCH] fdo#46843 look for order by clause as fifth child of
 select_statement

Since commit 33b9b857ea6cb5a6f731de68f58e532242c43d30 (dba34c: #i20306# support for window function and limit fetch first, ... added), order by is the fifth child. It was the fourth one before.
---
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 397cedb..267c7a9 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2319,10 +2319,9 @@ namespace
 const ::connectivity::OSQLParseNode* pParseRoot )
 {
 SqlParseError eErrorCode = eOk;
-if (!pParseRoot-getChild(3)-getChild(4)-isLeaf())
+if (!pParseRoot-getChild(3)-getChild(ORDER_BY_CHILD_POS)-isLeaf())
 {
-::connectivity::OSQLParseNode* pNode = pParseRoot-getChild(3)-getChild(4)-getChild(2);
+::connectivity::OSQLParseNode* pNode = pParseRoot-getChild(3)-getChild(ORDER_BY_CHILD_POS)-getChild(2);
 ::connectivity::OSQLParseNode* pParamRef = NULL;
 
 OQueryController rController = static_castOQueryController(_pView-getController());
-- 
1.7.7.3

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice