feat: methods for returning unquoted names and identifiers

Signed-off-by: Andreas Reichel <[email protected]> Signed-off-by: manticore-projects <[email protected]>
JSQLParser · Aug 19, 2024 · 7e7acba · 7e7acba
1 parent 728b286
commit 7e7acba
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 12 deletions.
diff --git a/src/main/java/net/sf/jsqlparser/expression/Alias.java b/src/main/java/net/sf/jsqlparser/expression/Alias.java
@@ -17,6 +17,7 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import net.sf.jsqlparser.schema.MultiPartName;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 
 public class Alias implements Serializable {
@@ -38,6 +39,10 @@ public String getName() {
         return name;
     }
 
+    public String getUnquotedName() {
+        return MultiPartName.unquote(name);
+    }
+
     public void setName(String name) {
         this.name = name;
     }

diff --git a/src/main/java/net/sf/jsqlparser/schema/Column.java b/src/main/java/net/sf/jsqlparser/schema/Column.java
@@ -101,7 +101,7 @@ public String getColumnName() {
     }
 
     public String getUnquotedColumnName() {
-        return unquote(columnName);
+        return MultiPartName.unquote(columnName);
     }
 
     public void setColumnName(String string) {
@@ -123,7 +123,7 @@ public String getFullyQualifiedName() {
 
     @Override
     public String getUnquotedName() {
-        return unquote(columnName);
+        return MultiPartName.unquote(columnName);
     }
 
     public String getFullyQualifiedName(boolean aliases) {

diff --git a/src/main/java/net/sf/jsqlparser/schema/Database.java b/src/main/java/net/sf/jsqlparser/schema/Database.java
@@ -59,7 +59,7 @@ public String getFullyQualifiedName() {
 
     @Override
     public String getUnquotedName() {
-        return unquote(databaseName);
+        return MultiPartName.unquote(databaseName);
     }
 
     @Override

diff --git a/src/main/java/net/sf/jsqlparser/schema/MultiPartName.java b/src/main/java/net/sf/jsqlparser/schema/MultiPartName.java
@@ -20,7 +20,7 @@ public interface MultiPartName {
      * @param quotedIdentifier the quoted identifier
      * @return the pure identifier without quotes
      */
-    default String unquote(String quotedIdentifier) {
+    static String unquote(String quotedIdentifier) {
         return quotedIdentifier != null
                 ? LEADING_TRAILING_QUOTES_PATTERN.matcher(quotedIdentifier).replaceAll("")
                 : null;

diff --git a/src/main/java/net/sf/jsqlparser/schema/Sequence.java b/src/main/java/net/sf/jsqlparser/schema/Sequence.java
@@ -123,7 +123,7 @@ public String getFullyQualifiedName() {
 
     @Override
     public String getUnquotedName() {
-        return unquote(partItems.get(NAME_IDX));
+        return MultiPartName.unquote(partItems.get(NAME_IDX));
     }
 
     @Override

diff --git a/src/main/java/net/sf/jsqlparser/schema/Server.java b/src/main/java/net/sf/jsqlparser/schema/Server.java
@@ -71,7 +71,7 @@ public String getFullyQualifiedName() {
 
     @Override
     public String getUnquotedName() {
-        return unquote(serverName);
+        return MultiPartName.unquote(serverName);
     }
 
     @Override

diff --git a/src/main/java/net/sf/jsqlparser/schema/Synonym.java b/src/main/java/net/sf/jsqlparser/schema/Synonym.java
@@ -108,7 +108,7 @@ public String getFullyQualifiedName() {
 
     @Override
     public String getUnquotedName() {
-        return unquote(partItems.get(NAME_IDX));
+        return MultiPartName.unquote(partItems.get(NAME_IDX));
     }
 
     @Override

diff --git a/src/main/java/net/sf/jsqlparser/schema/Table.java b/src/main/java/net/sf/jsqlparser/schema/Table.java
@@ -108,7 +108,7 @@ public String getDatabaseName() {
     }
 
     public String getUnquotedDatabaseName() {
-        return unquote(getDatabaseName());
+        return MultiPartName.unquote(getDatabaseName());
     }
 
     public void setDatabase(Database database) {
@@ -133,7 +133,7 @@ public String getSchemaName() {
     }
 
     public String getUnquotedSchemaName() {
-        return unquote(getSchemaName());
+        return MultiPartName.unquote(getSchemaName());
     }
 
     public Table setSchemaName(String schemaName) {
@@ -236,7 +236,7 @@ public String getFullyQualifiedName() {
 
     @Override
     public String getUnquotedName() {
-        return unquote(getName());
+        return MultiPartName.unquote(getName());
     }
 
     @Override

diff --git a/src/main/java/net/sf/jsqlparser/statement/select/SelectItem.java b/src/main/java/net/sf/jsqlparser/statement/select/SelectItem.java
@@ -67,6 +67,14 @@ public Alias getAlias() {
         return alias;
     }
 
+    public String getAliasName() {
+        return alias != null ? alias.getName() : null;
+    }
+
+    public String getUnquotedAliasName() {
+        return alias != null ? alias.getUnquotedName() : null;
+    }
+
     public void setAlias(Alias alias) {
         this.alias = alias;
     }

diff --git a/src/main/java/net/sf/jsqlparser/statement/select/WithItem.java b/src/main/java/net/sf/jsqlparser/statement/select/WithItem.java
@@ -54,6 +54,14 @@ public Alias getAlias() {
         return alias;
     }
 
+    public String getAliasName() {
+        return alias != null ? alias.getName() : null;
+    }
+
+    public String getUnquotedAliasName() {
+        return alias != null ? alias.getUnquotedName() : null;
+    }
+
     public void setAlias(Alias alias) {
         this.alias = alias;
     }
@@ -98,8 +106,6 @@ public String toString() {
                 builder.append(withItemList.get(i)).append(i < size - 1 ? "," : "");
             }
             builder.append(")");
-        } else {
-            builder.append("");
         }
         builder.append(" AS ");
         builder.append(statement);