File tree Expand file tree Collapse file tree 10 files changed +31
-12
lines changed
src/main/java/net/sf/jsqlparser Expand file tree Collapse file tree 10 files changed +31
-12
lines changed Original file line number Diff line number Diff line change 17
17
import java .util .Objects ;
18
18
import java .util .Optional ;
19
19
20
+ import net .sf .jsqlparser .schema .MultiPartName ;
20
21
import net .sf .jsqlparser .statement .create .table .ColDataType ;
21
22
22
23
public class Alias implements Serializable {
@@ -38,6 +39,10 @@ public String getName() {
38
39
return name ;
39
40
}
40
41
42
+ public String getUnquotedName () {
43
+ return MultiPartName .unquote (name );
44
+ }
45
+
41
46
public void setName (String name ) {
42
47
this .name = name ;
43
48
}
Original file line number Diff line number Diff line change @@ -101,7 +101,7 @@ public String getColumnName() {
101
101
}
102
102
103
103
public String getUnquotedColumnName () {
104
- return unquote (columnName );
104
+ return MultiPartName . unquote (columnName );
105
105
}
106
106
107
107
public void setColumnName (String string ) {
@@ -123,7 +123,7 @@ public String getFullyQualifiedName() {
123
123
124
124
@ Override
125
125
public String getUnquotedName () {
126
- return unquote (columnName );
126
+ return MultiPartName . unquote (columnName );
127
127
}
128
128
129
129
public String getFullyQualifiedName (boolean aliases ) {
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ public String getFullyQualifiedName() {
59
59
60
60
@ Override
61
61
public String getUnquotedName () {
62
- return unquote (databaseName );
62
+ return MultiPartName . unquote (databaseName );
63
63
}
64
64
65
65
@ Override
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ public interface MultiPartName {
20
20
* @param quotedIdentifier the quoted identifier
21
21
* @return the pure identifier without quotes
22
22
*/
23
- default String unquote (String quotedIdentifier ) {
23
+ static String unquote (String quotedIdentifier ) {
24
24
return quotedIdentifier != null
25
25
? LEADING_TRAILING_QUOTES_PATTERN .matcher (quotedIdentifier ).replaceAll ("" )
26
26
: null ;
Original file line number Diff line number Diff line change @@ -123,7 +123,7 @@ public String getFullyQualifiedName() {
123
123
124
124
@ Override
125
125
public String getUnquotedName () {
126
- return unquote (partItems .get (NAME_IDX ));
126
+ return MultiPartName . unquote (partItems .get (NAME_IDX ));
127
127
}
128
128
129
129
@ Override
Original file line number Diff line number Diff line change @@ -71,7 +71,7 @@ public String getFullyQualifiedName() {
71
71
72
72
@ Override
73
73
public String getUnquotedName () {
74
- return unquote (serverName );
74
+ return MultiPartName . unquote (serverName );
75
75
}
76
76
77
77
@ Override
Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ public String getFullyQualifiedName() {
108
108
109
109
@ Override
110
110
public String getUnquotedName () {
111
- return unquote (partItems .get (NAME_IDX ));
111
+ return MultiPartName . unquote (partItems .get (NAME_IDX ));
112
112
}
113
113
114
114
@ Override
Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ public String getDatabaseName() {
108
108
}
109
109
110
110
public String getUnquotedDatabaseName () {
111
- return unquote (getDatabaseName ());
111
+ return MultiPartName . unquote (getDatabaseName ());
112
112
}
113
113
114
114
public void setDatabase (Database database ) {
@@ -133,7 +133,7 @@ public String getSchemaName() {
133
133
}
134
134
135
135
public String getUnquotedSchemaName () {
136
- return unquote (getSchemaName ());
136
+ return MultiPartName . unquote (getSchemaName ());
137
137
}
138
138
139
139
public Table setSchemaName (String schemaName ) {
@@ -236,7 +236,7 @@ public String getFullyQualifiedName() {
236
236
237
237
@ Override
238
238
public String getUnquotedName () {
239
- return unquote (getName ());
239
+ return MultiPartName . unquote (getName ());
240
240
}
241
241
242
242
@ Override
Original file line number Diff line number Diff line change @@ -67,6 +67,14 @@ public Alias getAlias() {
67
67
return alias ;
68
68
}
69
69
70
+ public String getAliasName () {
71
+ return alias != null ? alias .getName () : null ;
72
+ }
73
+
74
+ public String getUnquotedAliasName () {
75
+ return alias != null ? alias .getUnquotedName () : null ;
76
+ }
77
+
70
78
public void setAlias (Alias alias ) {
71
79
this .alias = alias ;
72
80
}
Original file line number Diff line number Diff line change @@ -54,6 +54,14 @@ public Alias getAlias() {
54
54
return alias ;
55
55
}
56
56
57
+ public String getAliasName () {
58
+ return alias != null ? alias .getName () : null ;
59
+ }
60
+
61
+ public String getUnquotedAliasName () {
62
+ return alias != null ? alias .getUnquotedName () : null ;
63
+ }
64
+
57
65
public void setAlias (Alias alias ) {
58
66
this .alias = alias ;
59
67
}
@@ -98,8 +106,6 @@ public String toString() {
98
106
builder .append (withItemList .get (i )).append (i < size - 1 ? "," : "" );
99
107
}
100
108
builder .append (")" );
101
- } else {
102
- builder .append ("" );
103
109
}
104
110
builder .append (" AS " );
105
111
builder .append (statement );
You can’t perform that action at this time.
0 commit comments