Skip to content

Commit ce33906

Browse files
wumpzwumpz
committed
Alias class implemented and integrated
1 parent 2db02ad commit ce33906

16 files changed

Lines changed: 176 additions & 82 deletions

File tree

‎src/main/java/net/sf/jsqlparser/expression/Alias.java‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/*
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2014 JSQLParser
6+
* %%
7+
* This program is free software: you can redistribute it and/or modify
8+
* it under the terms of the GNU Lesser General Public License as
9+
* published by the Free Software Foundation, either version 2.1 of the
10+
* License, or (at your option) any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU General Lesser Public License for more details.
16+
*
17+
* You should have received a copy of the GNU General Lesser Public
18+
* License along with this program. If not, see
19+
* <http://www.gnu.org/licenses/lgpl-2.1.html>.
20+
* #L%
21+
*/
22+
package net.sf.jsqlparser.expression;
23+
24+
/**
25+
*
26+
* @author toben
27+
*/
28+
public class Alias {
29+
30+
private String name;
31+
private boolean useAs = true;
32+
33+
public Alias(String name) {
34+
this.name = name;
35+
}
36+
37+
public Alias(String name, boolean useAs) {
38+
this.name = name;
39+
this.useAs = useAs;
40+
}
41+
42+
public String getName() {
43+
return name;
44+
}
45+
46+
public void setName(String name) {
47+
this.name = name;
48+
}
49+
50+
public boolean isUseAs() {
51+
return useAs;
52+
}
53+
54+
public void setUseAs(boolean useAs) {
55+
this.useAs = useAs;
56+
}
57+
58+
@Override
59+
public String toString() {
60+
return (useAs ? " AS " : " ") + name;
61+
}
62+
}

‎src/main/java/net/sf/jsqlparser/schema/Table.java‎

100755100644
Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
*/
2222
package net.sf.jsqlparser.schema;
2323

24+
import net.sf.jsqlparser.expression.Alias;
2425
import net.sf.jsqlparser.statement.select.FromItem;
2526
import net.sf.jsqlparser.statement.select.FromItemVisitor;
2627
import net.sf.jsqlparser.statement.select.IntoTableVisitor;
@@ -33,7 +34,7 @@ public class Table implements FromItem {
3334

3435
private String schemaName;
3536
private String name;
36-
private String alias;
37+
private Alias alias;
3738
private Pivot pivot;
3839

3940
public Table() {
@@ -61,13 +62,13 @@ public void setSchemaName(String string) {
6162
}
6263

6364
@Override
64-
public String getAlias() {
65+
public Alias getAlias() {
6566
return alias;
6667
}
6768

6869
@Override
69-
public void setAlias(String string) {
70-
alias = string;
70+
public void setAlias(Alias alias) {
71+
this.alias = alias;
7172
}
7273

7374
public String getWholeTableName() {
@@ -95,10 +96,12 @@ public void accept(IntoTableVisitor intoTableVisitor) {
9596
intoTableVisitor.visit(this);
9697
}
9798

99+
@Override
98100
public Pivot getPivot() {
99101
return pivot;
100102
}
101103

104+
@Override
102105
public void setPivot(Pivot pivot) {
103106
this.pivot = pivot;
104107
}
@@ -107,6 +110,6 @@ public void setPivot(Pivot pivot) {
107110
public String toString() {
108111
return getWholeTableName() +
109112
((pivot != null) ? " "+pivot : "") +
110-
((alias != null) ? " AS " + alias : "");
113+
((alias != null) ? alias.toString() : "");
111114
}
112115
}

‎src/main/java/net/sf/jsqlparser/statement/select/ExpressionListItem.java‎

100755100644
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
*/
2222
package net.sf.jsqlparser.statement.select;
2323

24+
import net.sf.jsqlparser.expression.Alias;
2425
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
2526

2627
public class ExpressionListItem {
2728

2829
private ExpressionList expressionList;
29-
private String alias;
30+
private Alias alias;
3031

3132
public ExpressionList getExpressionList() {
3233
return expressionList;
@@ -36,16 +37,16 @@ public void setExpressionList(ExpressionList expressionList) {
3637
this.expressionList = expressionList;
3738
}
3839

39-
public String getAlias() {
40+
public Alias getAlias() {
4041
return alias;
4142
}
4243

43-
public void setAlias(String string) {
44-
alias = string;
44+
public void setAlias(Alias alias) {
45+
this.alias = alias;
4546
}
4647

4748
@Override
4849
public String toString() {
49-
return expressionList + ((alias != null) ? " AS " + alias : "");
50+
return expressionList + ((alias != null) ? alias.toString() : "");
5051
}
5152
}

‎src/main/java/net/sf/jsqlparser/statement/select/FromItem.java‎

100755100644
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
*/
2222
package net.sf.jsqlparser.statement.select;
2323

24+
import net.sf.jsqlparser.expression.Alias;
25+
2426
/**
2527
* An item in a "SELECT [...] FROM item1" statement. (for example a table or a
2628
* sub-select)
@@ -29,9 +31,9 @@ public interface FromItem {
2931

3032
void accept(FromItemVisitor fromItemVisitor);
3133

32-
String getAlias();
34+
Alias getAlias();
3335

34-
void setAlias(String alias);
36+
void setAlias(Alias alias);
3537

3638
Pivot getPivot();
3739

‎src/main/java/net/sf/jsqlparser/statement/select/FunctionItem.java‎

100755100644
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,20 @@
2121
*/
2222
package net.sf.jsqlparser.statement.select;
2323

24+
import net.sf.jsqlparser.expression.Alias;
2425
import net.sf.jsqlparser.expression.Function;
2526

2627
public class FunctionItem {
2728

2829
private Function function;
29-
private String alias;
30+
private Alias alias;
3031

31-
public String getAlias() {
32+
public Alias getAlias() {
3233
return alias;
3334
}
3435

35-
public void setAlias(String string) {
36-
alias = string;
36+
public void setAlias(Alias alias) {
37+
this.alias = alias;
3738
}
3839

3940
public Function getFunction() {
@@ -46,6 +47,6 @@ public void setFunction(Function function) {
4647

4748
@Override
4849
public String toString() {
49-
return function + ((alias != null) ? " AS " + alias : "");
50+
return function + ((alias != null) ? alias.toString() : "");
5051
}
5152
}

‎src/main/java/net/sf/jsqlparser/statement/select/LateralSubSelect.java‎

100755100644
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
*/
2222
package net.sf.jsqlparser.statement.select;
2323

24+
import net.sf.jsqlparser.expression.Alias;
25+
2426
/**
2527
* A lateral subselect followed by an alias.
2628
*
@@ -29,7 +31,7 @@
2931
public class LateralSubSelect implements FromItem {
3032

3133
private SubSelect subSelect;
32-
private String alias;
34+
private Alias alias;
3335
private Pivot pivot;
3436

3537
public void setSubSelect(SubSelect subSelect) {
@@ -46,12 +48,12 @@ public void accept(FromItemVisitor fromItemVisitor) {
4648
}
4749

4850
@Override
49-
public String getAlias() {
51+
public Alias getAlias() {
5052
return alias;
5153
}
5254

5355
@Override
54-
public void setAlias(String alias) {
56+
public void setAlias(Alias alias) {
5557
this.alias = alias;
5658
}
5759

@@ -67,6 +69,6 @@ public void setPivot(Pivot pivot) {
6769
public String toString() {
6870
return "LATERAL" + subSelect.toString() +
6971
((pivot != null) ? " "+pivot : "") +
70-
((alias != null) ? " AS " + alias : "");
72+
((alias != null) ? alias.toString() : "");
7173
}
7274
}

‎src/main/java/net/sf/jsqlparser/statement/select/SelectExpressionItem.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
*/
2222
package net.sf.jsqlparser.statement.select;
2323

24+
import net.sf.jsqlparser.expression.Alias;
2425
import net.sf.jsqlparser.expression.Expression;
2526

2627
/**
@@ -29,18 +30,18 @@
2930
public class SelectExpressionItem implements SelectItem {
3031

3132
private Expression expression;
32-
private String alias;
33+
private Alias alias;
3334

34-
public String getAlias() {
35+
public Alias getAlias() {
3536
return alias;
3637
}
3738

3839
public Expression getExpression() {
3940
return expression;
4041
}
4142

42-
public void setAlias(String string) {
43-
alias = string;
43+
public void setAlias(Alias alias) {
44+
this.alias = alias;
4445
}
4546

4647
public void setExpression(Expression expression) {
@@ -54,6 +55,6 @@ public void accept(SelectItemVisitor selectItemVisitor) {
5455

5556
@Override
5657
public String toString() {
57-
return expression + ((alias != null) ? " AS " + alias : "");
58+
return expression + ((alias != null) ? alias.toString() : "");
5859
}
5960
}

‎src/main/java/net/sf/jsqlparser/statement/select/SubJoin.java‎

100755100644
Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,17 @@
2121
*/
2222
package net.sf.jsqlparser.statement.select;
2323

24+
import net.sf.jsqlparser.expression.Alias;
25+
2426
/**
2527
* A table created by "(tab1 join tab2)".
2628
*/
2729
public class SubJoin implements FromItem {
2830

2931
private FromItem left;
3032
private Join join;
31-
private String alias;
32-
private Pivot pivot;
33+
private Alias alias;
34+
private Pivot pivot;
3335

3436
@Override
3537
public void accept(FromItemVisitor fromItemVisitor) {
@@ -52,28 +54,30 @@ public void setJoin(Join j) {
5254
join = j;
5355
}
5456

55-
public Pivot getPivot() {
56-
return pivot;
57-
}
57+
@Override
58+
public Pivot getPivot() {
59+
return pivot;
60+
}
5861

59-
public void setPivot(Pivot pivot) {
60-
this.pivot = pivot;
61-
}
62+
@Override
63+
public void setPivot(Pivot pivot) {
64+
this.pivot = pivot;
65+
}
6266

63-
@Override
64-
public String getAlias() {
67+
@Override
68+
public Alias getAlias() {
6569
return alias;
6670
}
6771

6872
@Override
69-
public void setAlias(String string) {
70-
alias = string;
73+
public void setAlias(Alias alias) {
74+
this.alias = alias;
7175
}
7276

7377
@Override
7478
public String toString() {
75-
return "(" + left + " " + join + ")" +
76-
((pivot != null) ? " "+pivot : "") +
77-
((alias != null) ? " AS " + alias : "");
79+
return "(" + left + " " + join + ")"
80+
+ ((pivot != null) ? " " + pivot : "")
81+
+ ((alias != null) ? alias.toString() : "");
7882
}
7983
}

0 commit comments

Comments
 (0)