|
From: <ger...@us...> - 2012-02-29 21:03:23
|
Revision: 6596
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6596&view=rev
Author: gerdwagner
Date: 2012-02-29 21:03:17 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Graph Plugin: Query Builder: Mixed up ASC and DESC in SQL generation and "order by" panel
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderCol.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderStructure.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryOrderTableModel.java
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/I18NStrings.properties
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-02-29 20:59:48 UTC (rev 6595)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-02-29 21:03:17 UTC (rev 6596)
@@ -53,6 +53,8 @@
Bug fixes:
+Graph Plugin: Query Builder: Mixed up ASC and DESC in SQL generation and "order by" panel
+
Hibernate Plugin: Fixed NullPointer that occurred in HQL execution concerning assisted but nonetheless initialized objects.
2947296 Table script creation for multiple tables fails (on OpenJDK)
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java 2012-02-29 20:59:48 UTC (rev 6595)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java 2012-02-29 21:03:17 UTC (rev 6596)
@@ -112,6 +112,6 @@
public boolean isSortedAsc()
{
- return _sorting != Sorting.ASC;
+ return _sorting == Sorting.ASC;
}
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderCol.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderCol.java 2012-02-29 20:59:48 UTC (rev 6595)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderCol.java 2012-02-29 21:03:17 UTC (rev 6596)
@@ -6,7 +6,7 @@
public class OrderCol implements SortedColumn
{
private String _qualifiedCol;
- private boolean _ascending;
+ private boolean _descending;
private boolean _aggregated;
@@ -20,7 +20,7 @@
public OrderCol(String simpleTableName, ColumnInfo columnInfo)
{
_qualifiedCol = simpleTableName + "." + columnInfo.getColumnName();
- _ascending = columnInfo.getQueryData().isSortedAsc();
+ _descending = false == columnInfo.getQueryData().isSortedAsc();
_aggregated = (AggregateFunctions.NONE != columnInfo.getQueryData().getAggregateFunction());
}
@@ -39,14 +39,14 @@
_qualifiedCol = qualifiedCol;
}
- public boolean isAscending()
+ public boolean isDescending()
{
- return _ascending;
+ return _descending;
}
- public void setAscending(boolean b)
+ public void setDescending(boolean b)
{
- _ascending = b;
+ _descending = b;
}
public boolean isAggregated()
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderStructure.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderStructure.java 2012-02-29 20:59:48 UTC (rev 6595)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderStructure.java 2012-02-29 21:03:17 UTC (rev 6596)
@@ -33,7 +33,7 @@
private String getOrderExpression(OrderCol orderCol, SelectClauseRes selectClause)
{
- String direction = orderCol.isAscending() ? " ASC" : "";
+ String direction = orderCol.isDescending() ? " DESC" : "";
if (orderCol.isAggregated())
{
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryOrderTableModel.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryOrderTableModel.java 2012-02-29 20:59:48 UTC (rev 6595)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryOrderTableModel.java 2012-02-29 21:03:17 UTC (rev 6596)
@@ -27,7 +27,7 @@
_colModel.addColumn(col);
col = new TableColumn(1);
- col.setHeaderValue(s_stringMgr.getString("graph.QueryOrderTableModel.Ascending"));
+ col.setHeaderValue(s_stringMgr.getString("graph.QueryOrderTableModel.Descending"));
final JCheckBox rendererCheckBox = new JCheckBox();
DefaultTableCellRenderer cellRenderer = new DefaultTableCellRenderer()
@@ -63,7 +63,7 @@
}
else
{
- return getSortedCol(row).isAscending();
+ return getSortedCol(row).isDescending();
}
}
@@ -83,7 +83,7 @@
protected void updateCol(OrderCol toBeUpdated, OrderCol update)
{
- toBeUpdated.setAscending(update.isAscending());
+ toBeUpdated.setDescending(update.isDescending());
toBeUpdated.setAggregated(update.isAggregated());
}
Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/I18NStrings.properties 2012-02-29 20:59:48 UTC (rev 6595)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/I18NStrings.properties 2012-02-29 21:03:17 UTC (rev 6596)
@@ -43,7 +43,7 @@
graph.GraphQueryOrderPanel.moveDown=Down
graph.QueryOrderTableModel.Column=Column
-graph.QueryOrderTableModel.Ascending=Ascending
+graph.QueryOrderTableModel.Descending=Descending
graph.GraphQueryOrderPanel.orderLabel=To change the order in which columns appear in the ORDER BY clause mark columns and move them:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
