corrected fix #311 and fix #332, introduced unaliased fqn of column

Author: wumpz

src/main/java/net/sf/jsqlparser/schema/Column.java

@@ -62,10 +62,19 @@ public void setColumnName(String string) {
 
     @Override
     public String getFullyQualifiedName() {
+        return getName(false);
+    }
+    
+    /**
+     * Get name with out without using aliases.
+     * @param aliases
+     * @return 
+     */
+    public String getName(boolean aliases) {
         StringBuilder fqn = new StringBuilder();
 
         if (table != null) {
-            if (table.getAlias() != null) {
+            if (table.getAlias() != null && aliases) {
                 fqn.append(table.getAlias().getName());
             } else {
                 fqn.append(table.getFullyQualifiedName());
@@ -87,6 +96,6 @@ public void accept(ExpressionVisitor expressionVisitor) {
 
     @Override
     public String toString() {
-        return getFullyQualifiedName();
+        return getName(true);
     }
 }

src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java

@@ -174,10 +174,6 @@ public void visit(PlainSelect plainSelect) {
         }
     }
 
-    public void visit(Column column) {
-        buffer.append(column.getFullyQualifiedName());
-    }
-
     @Override
     public void visit(AllTableColumns allTableColumns) {
         buffer.append(allTableColumns.getTable().getFullyQualifiedName()).append(".*");
@@ -360,7 +356,7 @@ public void deparseJoin(Join join) {
             buffer.append(" USING (");
             for (Iterator<Column> iterator = join.getUsingColumns().iterator(); iterator.hasNext();) {
                 Column column = iterator.next();
-                buffer.append(column.getFullyQualifiedName());
+                buffer.append(column.toString());
                 if (iterator.hasNext()) {
                     buffer.append(", ");
                 }

src/test/java/net/sf/jsqlparser/util/SelectUtilsTest.java

@@ -122,4 +122,13 @@ public void testTableAliasIssue311() {
         assertEquals("SELECT tab1.col1, tab1.col2, tab1.col3, tab2.b1, tab2.b2 FROM mytable1 AS tab1 LEFT JOIN mytable2 AS tab2 ON tab1.col1 = tab2.b1",
                     select.toString());
     }
+    
+    public void testTableAliasIssue311_2() {
+        Table table1 = new Table("mytable1");
+        table1.setAlias(new Alias("tab1"));
+
+        Column col = new Column(table1, "col1");
+        assertEquals("tab1.col1", col.toString());
+        assertEquals("mytable.col1", col.getFullyQualifiedName());
+    }
 }