From 0c42b5863209b33348b406b47a70709093ba76c8 Mon Sep 17 00:00:00 2001
From: johncurrier <johncurrier@e86a8a9b-1e1f-0410-8769-81452b7583c3>
Date: Wed, 9 Feb 2011 17:34:31 +0000
Subject: [PATCH] Added support for more fully defining table details in XML

---
 .../sourceforge/schemaspy/model/Table.java    | 55 +++++++++----------
 .../schemaspy/model/TableColumn.java          | 22 +++++---
 2 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/src/net/sourceforge/schemaspy/model/Table.java b/src/net/sourceforge/schemaspy/model/Table.java
index 69d93ab..9df45d0 100755
--- a/src/net/sourceforge/schemaspy/model/Table.java
+++ b/src/net/sourceforge/schemaspy/model/Table.java
@@ -1090,11 +1090,6 @@ public void update(TableMeta tableMeta) {
         for (TableColumnMeta colMeta : tableMeta.getColumns()) {
             TableColumn col = getColumn(colMeta.getName());
             if (col == null) {
-                if (tableMeta.getRemoteSchema() == null) {
-                    logger.warning("Unrecognized column '" + colMeta.getName() + "' for table '" + getName() + '\'');
-                    continue;
-                }
-
                 col = addColumn(colMeta);
             }
 
@@ -1115,32 +1110,36 @@ public void connect(TableMeta tableMeta, Map<String, Table> tables, Map<String,
         for (TableColumnMeta colMeta : tableMeta.getColumns()) {
             TableColumn col = getColumn(colMeta.getName());
 
-             // go thru the new foreign key defs and associate them with our columns
-            for (ForeignKeyMeta fk : colMeta.getForeignKeys()) {
-                Table parent = fk.getRemoteSchema() == null ? tables.get(fk.getTableName())
-                                                            : remoteTables.get(db.getRemoteTableKey(null, fk.getRemoteSchema(), fk.getTableName()));
-                if (parent != null) {
-                    TableColumn parentColumn = parent.getColumn(fk.getColumnName());
-
-                    if (parentColumn == null) {
-                        logger.warning(parent.getName() + '.' + fk.getColumnName() + " doesn't exist");
+            if (col != null) {
+                // go thru the new foreign key defs and associate them with our columns
+                for (ForeignKeyMeta fk : colMeta.getForeignKeys()) {
+                    Table parent = fk.getRemoteSchema() == null ? tables.get(fk.getTableName())
+                                                                : remoteTables.get(db.getRemoteTableKey(null, fk.getRemoteSchema(), fk.getTableName()));
+                    if (parent != null) {
+                        TableColumn parentColumn = parent.getColumn(fk.getColumnName());
+    
+                        if (parentColumn == null) {
+                            logger.warning(parent.getName() + '.' + fk.getColumnName() + " doesn't exist");
+                        } else {
+                            /**
+                             * Merely instantiating a foreign key constraint ties it
+                             * into its parent and child columns (& therefore their tables)
+                             */
+                            @SuppressWarnings("unused")
+                            ForeignKeyConstraint unused = 
+                            		new ForeignKeyConstraint(parentColumn, col) {
+                                @Override
+                                public String getName() {
+                                    return "Defined in XML";
+                                }
+                            };
+                        }
                     } else {
-                        /**
-                         * Merely instantiating a foreign key constraint ties it
-                         * into its parent and child columns (& therefore their tables)
-                         */
-                        @SuppressWarnings("unused")
-                        ForeignKeyConstraint unused = 
-                        		new ForeignKeyConstraint(parentColumn, col) {
-                            @Override
-                            public String getName() {
-                                return "Defined in XML";
-                            }
-                        };
+                        logger.warning("Undefined table '" + fk.getTableName() + "' referenced by '" + getName() + '.' + col.getName() + "' in XML metadata");
                     }
-                } else {
-                    logger.warning("Undefined table '" + fk.getTableName() + "' referenced by '" + getName() + '.' + col.getName() + '\'');
                 }
+            } else {
+                logger.warning("Undefined column '" + getName() + "." + colMeta.getName() + "' in XML metadata");
             }
         }
     }
diff --git a/src/net/sourceforge/schemaspy/model/TableColumn.java b/src/net/sourceforge/schemaspy/model/TableColumn.java
index 5537039..f68468b 100755
--- a/src/net/sourceforge/schemaspy/model/TableColumn.java
+++ b/src/net/sourceforge/schemaspy/model/TableColumn.java
@@ -111,14 +111,20 @@ public class TableColumn {
     public TableColumn(Table table, TableColumnMeta colMeta) {
         this.table = table;
         name = colMeta.getName();
-        id = null;
-        type = "Unknown";
-        length = 0;
-        decimalDigits = 0;
-        detailedSize = "";
-        isNullable = false;
-        isAutoUpdated = false;
-        defaultValue = null;
+        id = colMeta.getId();
+        type = colMeta.getType();
+        length = colMeta.getSize();
+        decimalDigits = colMeta.getDigits();
+        StringBuilder buf = new StringBuilder();
+        buf.append(length);
+        if (decimalDigits > 0) {
+            buf.append(',');
+            buf.append(decimalDigits);
+        }
+        detailedSize = buf.toString();
+        isNullable = colMeta.isNullable();
+        isAutoUpdated = colMeta.isAutoUpdated();
+        defaultValue = colMeta.getDefaultValue();
         comments = colMeta.getComments();
     }