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 · 728b286 · 728b286
1 parent 6298e79
commit 728b286
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 1 deletion.
diff --git a/src/main/java/net/sf/jsqlparser/schema/Column.java b/src/main/java/net/sf/jsqlparser/schema/Column.java
@@ -100,6 +100,10 @@ public String getColumnName() {
         return columnName;
     }
 
+    public String getUnquotedColumnName() {
+        return unquote(columnName);
+    }
+
     public void setColumnName(String string) {
         columnName = string;
     }
@@ -117,6 +121,11 @@ public String getFullyQualifiedName() {
         return getFullyQualifiedName(false);
     }
 
+    @Override
+    public String getUnquotedName() {
+        return unquote(columnName);
+    }
+
     public String getFullyQualifiedName(boolean aliases) {
         StringBuilder fqn = new StringBuilder();
 

diff --git a/src/main/java/net/sf/jsqlparser/schema/Database.java b/src/main/java/net/sf/jsqlparser/schema/Database.java
@@ -57,6 +57,11 @@ public String getFullyQualifiedName() {
         return fqn;
     }
 
+    @Override
+    public String getUnquotedName() {
+        return unquote(databaseName);
+    }
+
     @Override
     public String toString() {
         return getFullyQualifiedName();

diff --git a/src/main/java/net/sf/jsqlparser/schema/MultiPartName.java b/src/main/java/net/sf/jsqlparser/schema/MultiPartName.java
@@ -9,7 +9,24 @@
  */
 package net.sf.jsqlparser.schema;
 
+import java.util.regex.Pattern;
+
 public interface MultiPartName {
+    Pattern LEADING_TRAILING_QUOTES_PATTERN = Pattern.compile("^[\"\\[`]+|[\"\\]`]+$");
+
+    /**
+     * Removes leading and trailing quotes from a SQL quoted identifier
+     *
+     * @param quotedIdentifier the quoted identifier
+     * @return the pure identifier without quotes
+     */
+    default String unquote(String quotedIdentifier) {
+        return quotedIdentifier != null
+                ? LEADING_TRAILING_QUOTES_PATTERN.matcher(quotedIdentifier).replaceAll("")
+                : null;
+    }
 
     String getFullyQualifiedName();
+
+    String getUnquotedName();
 }
diff --git a/src/main/java/net/sf/jsqlparser/schema/Sequence.java b/src/main/java/net/sf/jsqlparser/schema/Sequence.java
@@ -121,6 +121,11 @@ public String getFullyQualifiedName() {
         return fqn.toString();
     }
 
+    @Override
+    public String getUnquotedName() {
+        return unquote(partItems.get(NAME_IDX));
+    }
+
     @Override
     public String toString() {
         StringBuilder sql = new StringBuilder(getFullyQualifiedName());

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

diff --git a/src/main/java/net/sf/jsqlparser/schema/Synonym.java b/src/main/java/net/sf/jsqlparser/schema/Synonym.java
@@ -106,6 +106,11 @@ public String getFullyQualifiedName() {
         return fqn.toString();
     }
 
+    @Override
+    public String getUnquotedName() {
+        return unquote(partItems.get(NAME_IDX));
+    }
+
     @Override
     public String toString() {
         StringBuilder sql = new StringBuilder(getFullyQualifiedName());

diff --git a/src/main/java/net/sf/jsqlparser/schema/Table.java b/src/main/java/net/sf/jsqlparser/schema/Table.java
@@ -103,6 +103,14 @@ public Database getDatabase() {
         return new Database(getIndex(DATABASE_IDX));
     }
 
+    public String getDatabaseName() {
+        return getIndex(DATABASE_IDX);
+    }
+
+    public String getUnquotedDatabaseName() {
+        return unquote(getDatabaseName());
+    }
+
     public void setDatabase(Database database) {
         setIndex(DATABASE_IDX, database.getDatabaseName());
         if (database.getServer() != null) {
@@ -124,6 +132,10 @@ public String getSchemaName() {
         return getIndex(SCHEMA_IDX);
     }
 
+    public String getUnquotedSchemaName() {
+        return unquote(getSchemaName());
+    }
+
     public Table setSchemaName(String schemaName) {
         this.setIndex(SCHEMA_IDX, schemaName);
         return this;
@@ -145,6 +157,7 @@ public String getName() {
         return name;
     }
 
+
     public void setName(String name) {
         setIndex(NAME_IDX, name);
     }
@@ -207,7 +220,6 @@ public String getFullyQualifiedName() {
             partItems.remove(partItems.size() - 1);
         }
 
-
         for (int i = partItems.size() - 1; i >= 0; i--) {
             String part = partItems.get(i);
             if (part == null) {
@@ -222,6 +234,11 @@ public String getFullyQualifiedName() {
         return fqn.toString();
     }
 
+    @Override
+    public String getUnquotedName() {
+        return unquote(getName());
+    }
+
     @Override
     public <T, S> T accept(FromItemVisitor<T> fromItemVisitor, S context) {
         return fromItemVisitor.visit(this, context);