From 3b9e48da1b1e42b8b88e291b25e53bbf38591a59 Mon Sep 17 00:00:00 2001
From: johncurrier <johncurrier@e86a8a9b-1e1f-0410-8769-81452b7583c3>
Date: Thu, 10 Feb 2011 16:21:37 +0000
Subject: [PATCH] Added an optional short_column_type to selectColumnTypesSql
 to simplify the generated ER diagrams. Otherwise they could become extremely
 large.

---
 dist/dbtypes.html                             |  3 ++-
 dist/releaseNotes.html                        | 13 ++++++++++---
 .../schemaspy/dbTypes/mysql.properties        |  7 ++++---
 .../sourceforge/schemaspy/model/Database.java |  1 +
 .../schemaspy/model/TableColumn.java          | 19 +++++++++++++++++++
 .../sourceforge/schemaspy/view/DotNode.java   |  2 +-
 6 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/dist/dbtypes.html b/dist/dbtypes.html
index 3a7b070..ee2199b 100644
--- a/dist/dbtypes.html
+++ b/dist/dbtypes.html
@@ -183,8 +183,9 @@ <h4>Custom SQL</h4>
  <tr>
   <td>selectColumnTypesSql</td>
   <td>table_name, column_name, column_type</td>
-  <td>&nbsp;</td>
+  <td>short_column_type</td>
   <td>Details of unusual column types such as ENUMs.
+  The short version is used within ER diagrams to help make them more readable.
   </td>
   <td>Database</td>
  </tr>
diff --git a/dist/releaseNotes.html b/dist/releaseNotes.html
index d971153..a119ddb 100644
--- a/dist/releaseNotes.html
+++ b/dist/releaseNotes.html
@@ -14,8 +14,14 @@ <h3><a href='http://schemaspy.sourceforge.net'>SchemaSpy</a> Release Notes</h3>
 
 <li class='release'>x.x.x - xx/xx/xxxx - Subversion revision 596
 <ul>
-    <li>Changed default from -lq (low quality) to -hq (high quality) after
-        seeing how the low quality diagrams look on various systems.<br>  
+    <li>Added an optional <code>short_column_type</code> to 
+        <code>selectColumnTypesSql</code> to simplify the generated ER diagrams.
+        Otherwise they could become extremely large. 
+        rev 624
+    </li>
+    <li>Changed default from <code>-lq</code> (low quality) to <code>-hq</code>
+        (high quality) after seeing how the low quality diagrams look on 
+        various systems.<br>  
         rev 623
     </li>
     <li>Implemented <a href="https://sourceforge.net/tracker/index.php?func=detail&aid=1598563&group_id=137197&atid=737990">
@@ -25,7 +31,8 @@ <h3><a href='http://schemaspy.sourceforge.net'>SchemaSpy</a> Release Notes</h3>
     </li>
     <li>Low quality rendering was always being used when multiple schemas 
         were being analyzed.  
-        Now honors -hq or -lq from command-line in for multiples.<br>
+        Now honors <code>-hq</code> or <code>-lq</code> from command-line for 
+        multiples.<br>
         rev 620
     </li>
     <li>Now makes sure XML-defined FKs point to PKs.  
diff --git a/src/net/sourceforge/schemaspy/dbTypes/mysql.properties b/src/net/sourceforge/schemaspy/dbTypes/mysql.properties
index 0075e33..f07e799 100755
--- a/src/net/sourceforge/schemaspy/dbTypes/mysql.properties
+++ b/src/net/sourceforge/schemaspy/dbTypes/mysql.properties
@@ -36,6 +36,7 @@ selectViewsSql=select table_schema as view_catalog, null as view_schema, table_n
 # this is only used for remote tables since row_count was returned in selectTablesSql
 selectRowCountSql=select table_rows row_count from information_schema.tables where table_name=:table 
 
-# return table_name, column_name, column_type for a specific :schema
-# for all column types that have special formatting
-selectColumnTypesSql=select table_name, column_name, column_type from information_schema.columns where table_schema=:schema and (column_type like 'enum(%' or column_type like 'set(%')
\ No newline at end of file
+# return table_name, column_name, column_type, short_column_type for a specific :schema
+# for all column types that have special formatting.
+# short_column_type is optional and is used in the ER diagrams to keep them from becoming bloated
+selectColumnTypesSql=select table_name, column_name, replace(column_type,"','","', '") as column_type, left(column_type, locate("(", column_type)-1) as short_column_type from information_schema.columns where table_schema=:schema and (column_type like 'enum(%' or column_type like 'set(%')
\ No newline at end of file
diff --git a/src/net/sourceforge/schemaspy/model/Database.java b/src/net/sourceforge/schemaspy/model/Database.java
index 8d4fa5e..1872b1a 100755
--- a/src/net/sourceforge/schemaspy/model/Database.java
+++ b/src/net/sourceforge/schemaspy/model/Database.java
@@ -502,6 +502,7 @@ private void initColumnTypes(Properties properties) throws SQLException {
                         TableColumn column = table.getColumn(columnName);
                         if (column != null) {
                             column.setType(rs.getString("column_type"));
+                            column.setShortType(getOptionalString(rs, "short_column_type"));
                         }
                     }
                 }
diff --git a/src/net/sourceforge/schemaspy/model/TableColumn.java b/src/net/sourceforge/schemaspy/model/TableColumn.java
index 1fd3f02..269c778 100755
--- a/src/net/sourceforge/schemaspy/model/TableColumn.java
+++ b/src/net/sourceforge/schemaspy/model/TableColumn.java
@@ -37,6 +37,7 @@ public class TableColumn {
     private final String name;
     private final Object id;
     private       String type;
+    private       String shortType;
     private final int length;
     private final int decimalDigits;
     private final String detailedSize;
@@ -173,6 +174,24 @@ public void setType(String type) {
         this.type = type;
     }
 
+    /**
+     * Abbreviated form of {@link #getType()}
+     *
+     * @return
+     */
+    public String getShortType() {
+        return shortType == null ? type : shortType;
+    }
+    
+    /**
+     * Abbreviated form of {@link #setType(String)}
+     *
+     * @param shortType
+     */
+    public void setShortType(String shortType) {
+        this.shortType = shortType;
+    }
+
     /**
      * Length of the column.
      * See {@link DatabaseMetaData#getColumns(String, String, String, String)}'s <code>BUFFER_LENGTH</code>,
diff --git a/src/net/sourceforge/schemaspy/view/DotNode.java b/src/net/sourceforge/schemaspy/view/DotNode.java
index 659b2d6..572ac56 100755
--- a/src/net/sourceforge/schemaspy/view/DotNode.java
+++ b/src/net/sourceforge/schemaspy/view/DotNode.java
@@ -121,7 +121,7 @@ else if (indexColumns.contains(column))
                         buf.append("<TD PORT=\"");
                         buf.append(column.getName());
                         buf.append(".type\" ALIGN=\"LEFT\">");
-                        buf.append(column.getType().toLowerCase());
+                        buf.append(column.getShortType().toLowerCase());
                         buf.append("[");
                         buf.append(column.getDetailedSize());
                         buf.append("]</TD>");