|
From: <wi...@us...> - 2011-08-22 20:29:57
|
Revision: 6376
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6376&view=rev
Author: wis775
Date: 2011-08-22 20:29:51 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
SQL with aliases don't result always with aliases as column headings - Fixed for Export to CSV/XLS/XML
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/ResultSetExportData.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-08-21 20:10:35 UTC (rev 6375)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-08-22 20:29:51 UTC (rev 6376)
@@ -108,6 +108,11 @@
Bug-fixes:
+3308469, 3209074, 2983094: SQL with aliases don't result always with aliases as column headings
+ Affected modules:
+ - Export as CSV/XLS/XML
+
+
Fixed some memory issues with closed sessions.
Introduced performance warning for the global preference " Save Preferences Immediately" when
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java 2011-08-21 20:10:35 UTC (rev 6375)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java 2011-08-22 20:29:51 UTC (rev 6376)
@@ -24,6 +24,7 @@
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory;
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeDate;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeGeneral;
import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
/**
* This defines the display information for a column.
@@ -488,5 +489,24 @@
_dialectType = type;
}
+ /**
+ * Returns the column heading to display.
+ * The return value depends on the global preferences {@link DataTypeGeneral#isUseColumnLabelInsteadColumnName()}.
+ * If this is true, then the label of the column will be returned, otherwise the name of the column.
+ * <p><b>Note: </b> The label of the column represents an alias for the column.</p>
+ * @return the heading of a column. Either the label or the column name.
+ * @see #getColumnName()
+ * @see #getLabel()
+ * @see DataTypeGeneral#isUseColumnLabelInsteadColumnName()
+ */
+ public String getColumnHeading(){
+ if (DataTypeGeneral.isUseColumnLabelInsteadColumnName()){
+ return getLabel();
+ }
+ else {
+ return getColumnName();
+ }
+ }
+
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2011-08-21 20:10:35 UTC (rev 6375)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2011-08-22 20:29:51 UTC (rev 6376)
@@ -450,16 +450,7 @@
ExtTableColumn col = new ExtTableColumn(i, colWidth,
CellComponentFactory.getTableCellRenderer(colDefs[i]), null);
- String headerValue;
- if (DataTypeGeneral.isUseColumnLabelInsteadColumnName())
- {
- headerValue = colDef.getLabel();
- }
- else
- {
- headerValue = colDef.getColumnName();
- }
-
+ String headerValue = colDef.getColumnHeading();
col.setHeaderValue(headerValue);
col.setColumnDisplayDefinition(colDef);
cm.addColumn(col);
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java 2011-08-21 20:10:35 UTC (rev 6375)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java 2011-08-22 20:29:51 UTC (rev 6376)
@@ -73,15 +73,7 @@
StringBuffer buf = new StringBuffer();
for (int i = 0; i < colDefs.length; ++i)
{
- String headerValue;
- if (DataTypeGeneral.isUseColumnLabelInsteadColumnName())
- {
- headerValue = colDefs[i].getLabel();
- }
- else
- {
- headerValue = colDefs[i].getColumnName();
- }
+ String headerValue = colDefs[i].getColumnHeading();
buf.append(format(headerValue, colDefs[i].getDisplayWidth(), ' '));
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java 2011-08-21 20:10:35 UTC (rev 6375)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java 2011-08-22 20:29:51 UTC (rev 6376)
@@ -114,7 +114,7 @@
}
else
{
- return _colDefs != null ? _colDefs[col].getColumnName() : super.getColumnName(col);
+ return _colDefs != null ? _colDefs[col].getColumnHeading() : super.getColumnName(col);
}
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/ResultSetExportData.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/ResultSetExportData.java 2011-08-21 20:10:35 UTC (rev 6375)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/ResultSetExportData.java 2011-08-22 20:29:51 UTC (rev 6376)
@@ -103,12 +103,7 @@
public Iterator<String> getHeaders() {
List<String> headers = new ArrayList<String>();
for (ColumnDisplayDefinition col : this.colDispDef) {
- String headerValue;
- if (DataTypeGeneral.isUseColumnLabelInsteadColumnName()){
- headerValue = col.getLabel();
- } else {
- headerValue = col.getColumnName();
- }
+ String headerValue = col.getColumnHeading();
headers.add(headerValue);
}
return headers.iterator();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
