diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java
index 2243112f37..6ce05dd820 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tools.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java
@@ -544,7 +544,9 @@ final class Tools {
      * <a href=
      * "https://www.postgresql.org/docs/9.5/static/functions-json.html">https://www.postgresql.org/docs/current/static/functions-json.html</a>,
      * <a href=
-     * "https://www.postgresql.org/docs/current/static/ltree.html">https://www.postgresql.org/docs/current/static/ltree.html</a>.
+     * "https://www.postgresql.org/docs/current/static/ltree.html">https://www.postgresql.org/docs/current/static/ltree.html</a>,
+     * <a href=
+     * "https://www.postgresql.org/docs/current/static/functions-geometry.html">https://www.postgresql.org/docs/current/static/functions-geometry.html</a>.
      * <p>
      * [#5307] Known PostgreSQL JSON operators:
      * <ul>
@@ -552,7 +554,7 @@ final class Tools {
      * <li>?&</li>
      * </ul>
      * <p>
-     * Known PostgreSQL LTREE operators:
+     * [#7035] Known PostgreSQL LTREE operators:
      * <ul>
      * <li>? (we cannot handle this one)</li>
      * <li>?@&gt;</li>
@@ -560,6 +562,13 @@ final class Tools {
      * <li>?~</li>
      * <li>?@</li>
      * </ul>
+     * <p>
+     * [#7037] Known PostgreSQL Geometry operators:
+     * <ul>
+     * <li>?#</li>
+     * <li>?-</li>
+     * <li>?|</li>
+     * </ul>
      */
     private static final String[] NON_BIND_VARIABLE_SUFFIXES                   = {
         "?",
@@ -567,7 +576,9 @@ final class Tools {
         "&",
         "@",
         "<",
-        "~"
+        "~",
+        "#",
+        "-"
     };
 
     /**