diff --git a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlConfig.java b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlConfig.java index 0c51d8eca592..45a01eeeb459 100644 --- a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlConfig.java +++ b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlConfig.java @@ -22,7 +22,7 @@ public class PostgreSqlConfig { private ArrayMapping arrayMapping = ArrayMapping.DISABLED; private boolean includeSystemTables; - private boolean enableStringPushdownWithCollate; + private boolean enableStringPushdownWithCollate = true; public enum ArrayMapping { @@ -62,7 +62,8 @@ public boolean isEnableStringPushdownWithCollate() return enableStringPushdownWithCollate; } - @Config("postgresql.experimental.enable-string-pushdown-with-collate") + @Config("postgresql.enable-string-pushdown-with-collate") + @LegacyConfig("postgresql.experimental.enable-string-pushdown-with-collate") public PostgreSqlConfig setEnableStringPushdownWithCollate(boolean enableStringPushdownWithCollate) { this.enableStringPushdownWithCollate = enableStringPushdownWithCollate; diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConfig.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConfig.java index 8ca80f04f058..8137402de8af 100644 --- a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConfig.java +++ b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlConfig.java @@ -30,7 +30,7 @@ public void testDefaults() assertRecordedDefaults(recordDefaults(PostgreSqlConfig.class) .setArrayMapping(PostgreSqlConfig.ArrayMapping.DISABLED) .setIncludeSystemTables(false) - .setEnableStringPushdownWithCollate(false)); + .setEnableStringPushdownWithCollate(true)); } @Test @@ -39,13 +39,13 @@ public void testExplicitPropertyMappings() Map properties = ImmutableMap.builder() .put("postgresql.array-mapping", "AS_ARRAY") .put("postgresql.include-system-tables", "true") - .put("postgresql.experimental.enable-string-pushdown-with-collate", "true") + .put("postgresql.enable-string-pushdown-with-collate", "false") .buildOrThrow(); PostgreSqlConfig expected = new PostgreSqlConfig() .setArrayMapping(PostgreSqlConfig.ArrayMapping.AS_ARRAY) .setIncludeSystemTables(true) - .setEnableStringPushdownWithCollate(true); + .setEnableStringPushdownWithCollate(false); assertFullMapping(properties, expected); }