diff --git a/agents/common/src/main/java/com/dbx/agent/MetadataListConstraints.java b/agents/common/src/main/java/com/dbx/agent/MetadataListConstraints.java index 9e8b4f0ba6..0fcf8155e5 100644 --- a/agents/common/src/main/java/com/dbx/agent/MetadataListConstraints.java +++ b/agents/common/src/main/java/com/dbx/agent/MetadataListConstraints.java @@ -61,6 +61,10 @@ public final class MetadataListConstraints { } public String fuzzyLikePattern() { + return fuzzyLikePattern('\\'); + } + + public String fuzzyLikePattern(char escapeCharacter) { if (filter.isEmpty()) { return "%%"; } @@ -68,8 +72,8 @@ public final class MetadataListConstraints { builder.append('%'); for (int i = 0; i < filter.length(); i++) { char ch = filter.charAt(i); - if (ch == '\\' || ch == '%' || ch == '_') { - builder.append('\\'); + if (ch == escapeCharacter || ch == '%' || ch == '_') { + builder.append(escapeCharacter); } builder.append(ch); builder.append('%'); diff --git a/agents/common/src/test/java/com/dbx/agent/MetadataListConstraintsTest.java b/agents/common/src/test/java/com/dbx/agent/MetadataListConstraintsTest.java new file mode 100644 index 0000000000..95ca7bb013 --- /dev/null +++ b/agents/common/src/test/java/com/dbx/agent/MetadataListConstraintsTest.java @@ -0,0 +1,21 @@ +package com.dbx.agent; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +class MetadataListConstraintsTest { + @Test + void fuzzyLikePatternKeepsBackslashAsDefaultEscapeCharacter() { + MetadataListConstraints constraints = new MetadataListConstraints("a_%~\\", null, null, null); + + assertEquals("%a%\\_%\\%%~%\\\\%", constraints.fuzzyLikePattern()); + } + + @Test + void fuzzyLikePatternSupportsDatabaseSpecificEscapeCharacter() { + MetadataListConstraints constraints = new MetadataListConstraints("a_%~\\", null, null, null); + + assertEquals("%a%~_%~%%~~%\\%", constraints.fuzzyLikePattern('~')); + } +} diff --git a/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java b/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java index 76075a841f..03cd233b6b 100644 --- a/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java +++ b/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java @@ -408,8 +408,8 @@ public final class DamengAgent extends BaseDatabaseAgent { if (!constraints.hasFilter()) { return; } - sql.append(" AND UPPER(").append(column).append(") LIKE ? ESCAPE '\\\\'"); - args.add(constraints.fuzzyLikePattern().toUpperCase(Locale.ROOT)); + sql.append(" AND UPPER(").append(column).append(") LIKE ? ESCAPE '~'"); + args.add(constraints.fuzzyLikePattern('~').toUpperCase(Locale.ROOT)); } private static void appendLimitOffset(StringBuilder sql, List args, MetadataListConstraints constraints) { diff --git a/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentTest.java b/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentTest.java index 583c284517..128a647479 100644 --- a/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentTest.java +++ b/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentTest.java @@ -140,7 +140,7 @@ class DamengAgentTest extends JdbcFakeExecutionBehaviorTest { assertTrue(query.sql().contains("o.OBJECT_TYPE = 'MATERIALIZED VIEW'")); assertTrue(query.sql().contains("mv.MVIEW_NAME IS NOT NULL")); assertTrue(query.sql().contains("IN (?, ?)")); - assertTrue(query.sql().contains("UPPER(o.OBJECT_NAME) LIKE ? ESCAPE '\\\\'")); + assertTrue(query.sql().contains("UPPER(o.OBJECT_NAME) LIKE ? ESCAPE '~'")); assertTrue(query.sql().endsWith("LIMIT ? OFFSET ?")); assertEquals(List.of("APP", "TABLE", "VIEW", "%O%R%D%", 50, 100), query.args()); } @@ -186,7 +186,7 @@ class DamengAgentTest extends JdbcFakeExecutionBehaviorTest { assertFalse(query.sql().contains("USER_MVIEWS")); assertFalse(query.sql().contains("DBMS_METADATA.GET_DDL")); assertTrue(query.sql().contains("mv.MVIEW_NAME IS NOT NULL")); - assertTrue(query.sql().contains("UPPER(o.OBJECT_NAME) LIKE ? ESCAPE '\\\\'")); + assertTrue(query.sql().contains("UPPER(o.OBJECT_NAME) LIKE ? ESCAPE '~'")); assertTrue(query.sql().endsWith("LIMIT ? OFFSET ?")); assertEquals(List.of("REPORTING", "VIEW", "MATERIALIZED_VIEW", "%S%A%L%E%S%", 20, 40), query.args()); } @@ -220,6 +220,17 @@ class DamengAgentTest extends JdbcFakeExecutionBehaviorTest { assertEquals(List.of("APP", "PROCEDURE", "FUNCTION", "%S%Y%N%C%", 20), query.args()); } + @Test + void constrainedTableQueryEscapesDamengLikeWildcardsWithSingleCharacter() { + DamengAgent.MetadataQuery query = DamengAgent.buildConstrainedTablesQuery( + "APP", + new MetadataListConstraints("a_%~\\", 20, null, List.of("TABLE")) + ); + + assertTrue(query.sql().contains("UPPER(o.OBJECT_NAME) LIKE ? ESCAPE '~'")); + assertEquals(List.of("APP", "TABLE", "%A%~_%~%%~~%\\%", 20), query.args()); + } + @Test void accessibleObjectQueryBulkClassifiesViewsAndPreservesPaging() { DamengAgent.MetadataQuery query = DamengAgent.buildAccessibleConstrainedObjectsQuery(