Skip to content

Commit 7fa4f85

Browse files
committed
removed some changes
1 parent a78ab94 commit 7fa4f85

File tree

9 files changed

+52
-42
lines changed

9 files changed

+52
-42
lines changed

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

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@
2222
package net.sf.jsqlparser.schema;
2323

2424
import net.sf.jsqlparser.expression.*;
25-
import net.sf.jsqlparser.statement.select.*;
2625

2726
/**
2827
* A column. It can have the table name it belongs to.
2928
*/
30-
public class Column implements SelectItem, Expression, MultiPartName {
29+
public final class Column implements Expression, MultiPartName {
3130

3231
private Table table;
3332
private String columnName;
@@ -62,21 +61,18 @@ public void setColumnName(String string) {
6261

6362
@Override
6463
public String getFullyQualifiedName() {
65-
String fqn = "";
64+
StringBuilder fqn = new StringBuilder();
6665

6766
if (table != null) {
68-
fqn += table.getFullyQualifiedName();
67+
fqn.append(table.getFullyQualifiedName());
6968
}
70-
if (!fqn.isEmpty()) {
71-
fqn += ".";
69+
if (fqn.length()>0) {
70+
fqn.append('.');
7271
}
73-
74-
7572
if (columnName != null) {
76-
fqn += columnName;
73+
fqn.append(columnName);
7774
}
78-
79-
return fqn;
75+
return fqn.toString();
8076
}
8177

8278
@Override
@@ -88,9 +84,4 @@ public void accept(ExpressionVisitor expressionVisitor) {
8884
public String toString() {
8985
return getFullyQualifiedName();
9086
}
91-
92-
@Override
93-
public void accept(SelectItemVisitor selectItemVisitor) {
94-
selectItemVisitor.visit(this);
95-
}
9687
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import java.util.regex.*;
2525

26-
public class Server implements MultiPartName {
26+
public final class Server implements MultiPartName {
2727
public static final Pattern SERVER_PATTERN = Pattern.compile("\\[([^\\]]+?)(?:\\\\([^\\]]+))?\\]");
2828

2929
private String serverName;

src/main/java/net/sf/jsqlparser/statement/select/AllColumns.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@
2626
/**
2727
* All the columns (as in "SELECT * FROM ...")
2828
*/
29-
public class AllColumns extends Column implements SelectItem {
29+
public class AllColumns implements SelectItem {
3030

3131
public AllColumns() {
32-
super("*");
3332
}
3433

3534
@Override
@@ -39,6 +38,6 @@ public void accept(SelectItemVisitor selectItemVisitor) {
3938

4039
@Override
4140
public String toString() {
42-
return getColumnName();
41+
return "*";
4342
}
4443
}

src/main/java/net/sf/jsqlparser/statement/select/AllTableColumns.java

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,34 @@
2424
/**
2525
* All the columns of a table (as in "SELECT TableName.* FROM ...")
2626
*/
27-
2827
import net.sf.jsqlparser.schema.*;
2928

30-
public class AllTableColumns extends Column implements SelectItem {
31-
public AllTableColumns(Table table) {
32-
super(table, "*");
33-
}
29+
public class AllTableColumns implements SelectItem {
30+
31+
private Table table;
32+
33+
public AllTableColumns() {
34+
}
35+
36+
public AllTableColumns(Table tableName) {
37+
this.table = tableName;
38+
}
39+
40+
public Table getTable() {
41+
return table;
42+
}
43+
44+
public void setTable(Table table) {
45+
this.table = table;
46+
}
47+
48+
@Override
49+
public void accept(SelectItemVisitor selectItemVisitor) {
50+
selectItemVisitor.visit(this);
51+
}
3452

35-
@Override
36-
public void accept(SelectItemVisitor selectItemVisitor) {
37-
selectItemVisitor.visit(this);
38-
}
53+
@Override
54+
public String toString() {
55+
return table + ".*";
56+
}
3957
}

src/main/java/net/sf/jsqlparser/statement/select/SelectItemVisitor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
*/
2222
package net.sf.jsqlparser.statement.select;
2323

24-
import net.sf.jsqlparser.schema.*;
25-
2624
public interface SelectItemVisitor {
2725

28-
void visit(Column column);
26+
void visit(AllColumns allColumns);
2927

3028
void visit(AllTableColumns allTableColumns);
3129

src/main/java/net/sf/jsqlparser/util/AddAliasesVisitor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@ public void visit(SetOperationList setOpList) {
6363
}
6464
}
6565

66-
@Override
67-
public void visit(Column column) {
68-
throw new UnsupportedOperationException("Not supported yet.");
69-
}
70-
7166
@Override
7267
public void visit(AllTableColumns allTableColumns) {
7368
throw new UnsupportedOperationException("Not supported yet.");
@@ -117,4 +112,9 @@ public void setPrefix(String prefix) {
117112
public void visit(WithItem withItem) {
118113
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
119114
}
115+
116+
@Override
117+
public void visit(AllColumns allColumns) {
118+
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
119+
}
120120
}

src/main/java/net/sf/jsqlparser/util/ConnectExpressionsVisitor.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
package net.sf.jsqlparser.util;
2323

2424
import net.sf.jsqlparser.expression.*;
25-
import net.sf.jsqlparser.schema.*;
2625
import net.sf.jsqlparser.statement.select.*;
2726

2827
import java.util.*;
@@ -38,7 +37,7 @@
3837
public abstract class ConnectExpressionsVisitor implements SelectVisitor, SelectItemVisitor {
3938

4039
private String alias = "expr";
41-
private List<SelectExpressionItem> itemsExpr = new LinkedList<SelectExpressionItem>();
40+
private final List<SelectExpressionItem> itemsExpr = new LinkedList<SelectExpressionItem>();
4241

4342
public ConnectExpressionsVisitor() {
4443
}
@@ -94,12 +93,12 @@ public void visit(WithItem withItem) {
9493
}
9594

9695
@Override
97-
public void visit(Column column) {
96+
public void visit(AllTableColumns allTableColumns) {
9897
throw new UnsupportedOperationException("Not supported yet.");
9998
}
10099

101100
@Override
102-
public void visit(AllTableColumns allTableColumns) {
101+
public void visit(AllColumns allColumns) {
103102
throw new UnsupportedOperationException("Not supported yet.");
104103
}
105104

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,4 +348,9 @@ public void visit(LateralSubSelect lateralSubSelect) {
348348
public void visit(ValuesList valuesList) {
349349
buffer.append(valuesList.toString());
350350
}
351+
352+
@Override
353+
public void visit(AllColumns allColumns) {
354+
buffer.append('*');
355+
}
351356
}

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public void testOperationsWithSigns() throws JSQLParserException {
161161
assertTrue(sub.getRightExpression() instanceof SignedExpression);
162162

163163
SignedExpression sexpr = (SignedExpression) sub.getRightExpression();
164-
assertEquals("-", sexpr.getSign());
164+
assertEquals('-', sexpr.getSign());
165165
assertEquals("1", sexpr.getExpression().toString());
166166
}
167167

0 commit comments

Comments
 (0)