[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6340] trunk/sql12/fw/src/main/java/net/ sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java

[<wi...@us...>]

Revision: 6340
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6340&view=rev
Author:   wis775
Date:     2011-08-05 17:42:15 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
Fixed NPE: Sometimes, the table name is null. E.g if the select statement contains a union clause.

Modified Paths:
--------------
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java

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-04 21:26:15 UTC (rev 6339)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java	2011-08-05 17:42:15 UTC (rev 6340)
@@ -191,11 +191,15 @@
 	    String columnLabel = md.getColumnLabel(idx);
 	    String columnName = md.getColumnName(idx);
 	    int displayWidth = columnLabel.length();
+	    
+	    // Sometimes, the table name is null. eg if the select statement contains a union clause.
 	    String fullTableColumnName = 
-	        new StringBuilder(md.getTableName(idx))
+	        new StringBuilder()
+	    			.append(md.getTableName(idx))
 	                .append(":")
 	                .append(columnName)
 	                .toString();
+	    
 	    int sqlType = md.getColumnType(idx);
 	    String sqlTypeName = md.getColumnTypeName(idx);
 	    boolean isNullable = 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.