Skip to content

Commit 7e7acba

Browse files
feat: methods for returning unquoted names and identifiers
Signed-off-by: Andreas Reichel <andreas@manticore-projects.com> Signed-off-by: manticore-projects <andreas@manticore-projects.com>
1 parent 728b286 commit 7e7acba

File tree

10 files changed

+31
-12
lines changed

10 files changed

+31
-12
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.Objects;
1818
import java.util.Optional;
1919

20+
import net.sf.jsqlparser.schema.MultiPartName;
2021
import net.sf.jsqlparser.statement.create.table.ColDataType;
2122

2223
public class Alias implements Serializable {
@@ -38,6 +39,10 @@ public String getName() {
3839
return name;
3940
}
4041

42+
public String getUnquotedName() {
43+
return MultiPartName.unquote(name);
44+
}
45+
4146
public void setName(String name) {
4247
this.name = name;
4348
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public String getColumnName() {
101101
}
102102

103103
public String getUnquotedColumnName() {
104-
return unquote(columnName);
104+
return MultiPartName.unquote(columnName);
105105
}
106106

107107
public void setColumnName(String string) {
@@ -123,7 +123,7 @@ public String getFullyQualifiedName() {
123123

124124
@Override
125125
public String getUnquotedName() {
126-
return unquote(columnName);
126+
return MultiPartName.unquote(columnName);
127127
}
128128

129129
public String getFullyQualifiedName(boolean aliases) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public String getFullyQualifiedName() {
5959

6060
@Override
6161
public String getUnquotedName() {
62-
return unquote(databaseName);
62+
return MultiPartName.unquote(databaseName);
6363
}
6464

6565
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface MultiPartName {
2020
* @param quotedIdentifier the quoted identifier
2121
* @return the pure identifier without quotes
2222
*/
23-
default String unquote(String quotedIdentifier) {
23+
static String unquote(String quotedIdentifier) {
2424
return quotedIdentifier != null
2525
? LEADING_TRAILING_QUOTES_PATTERN.matcher(quotedIdentifier).replaceAll("")
2626
: null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public String getFullyQualifiedName() {
123123

124124
@Override
125125
public String getUnquotedName() {
126-
return unquote(partItems.get(NAME_IDX));
126+
return MultiPartName.unquote(partItems.get(NAME_IDX));
127127
}
128128

129129
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public String getFullyQualifiedName() {
7171

7272
@Override
7373
public String getUnquotedName() {
74-
return unquote(serverName);
74+
return MultiPartName.unquote(serverName);
7575
}
7676

7777
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public String getFullyQualifiedName() {
108108

109109
@Override
110110
public String getUnquotedName() {
111-
return unquote(partItems.get(NAME_IDX));
111+
return MultiPartName.unquote(partItems.get(NAME_IDX));
112112
}
113113

114114
@Override

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public String getDatabaseName() {
108108
}
109109

110110
public String getUnquotedDatabaseName() {
111-
return unquote(getDatabaseName());
111+
return MultiPartName.unquote(getDatabaseName());
112112
}
113113

114114
public void setDatabase(Database database) {
@@ -133,7 +133,7 @@ public String getSchemaName() {
133133
}
134134

135135
public String getUnquotedSchemaName() {
136-
return unquote(getSchemaName());
136+
return MultiPartName.unquote(getSchemaName());
137137
}
138138

139139
public Table setSchemaName(String schemaName) {
@@ -236,7 +236,7 @@ public String getFullyQualifiedName() {
236236

237237
@Override
238238
public String getUnquotedName() {
239-
return unquote(getName());
239+
return MultiPartName.unquote(getName());
240240
}
241241

242242
@Override

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,14 @@ public Alias getAlias() {
6767
return alias;
6868
}
6969

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+
7078
public void setAlias(Alias alias) {
7179
this.alias = alias;
7280
}

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ public Alias getAlias() {
5454
return alias;
5555
}
5656

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+
5765
public void setAlias(Alias alias) {
5866
this.alias = alias;
5967
}
@@ -98,8 +106,6 @@ public String toString() {
98106
builder.append(withItemList.get(i)).append(i < size - 1 ? "," : "");
99107
}
100108
builder.append(")");
101-
} else {
102-
builder.append("");
103109
}
104110
builder.append(" AS ");
105111
builder.append(statement);

0 commit comments

Comments
 (0)