fix; do not add double quotes to identifiers already double quoted fi…

…xes Issue pgjdbc#2223
davecramer · Aug 9, 2021 · a40f1b2 · a40f1b2
1 parent 151b287
commit a40f1b2
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/pgjdbc/src/main/java/org/postgresql/core/Utils.java b/pgjdbc/src/main/java/org/postgresql/core/Utils.java
@@ -131,8 +131,13 @@ public static StringBuilder escapeIdentifier(@Nullable StringBuilder sbuf, Strin
    * @param value value to append
    */
   private static void doAppendEscapedIdentifier(Appendable sbuf, String value) throws SQLException {
+
+    boolean alreadyQuoted = value.startsWith("\"") && value.endsWith("\"");
+
     try {
-      sbuf.append('"');
+      if ( !alreadyQuoted ) {
+        sbuf.append('"');
+      }
 
       for (int i = 0; i < value.length(); ++i) {
         char ch = value.charAt(i);
@@ -146,7 +151,9 @@ private static void doAppendEscapedIdentifier(Appendable sbuf, String value) thr
         sbuf.append(ch);
       }
 
-      sbuf.append('"');
+      if ( !alreadyQuoted ) {
+        sbuf.append('"');
+      }
     } catch (IOException e) {
       throw new PSQLException(GT.tr("No IOException expected from StringBuffer or StringBuilder"),
           PSQLState.UNEXPECTED_ERROR, e);