Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -62,7 +62,8 @@ public boolean isEnableStringPushdownWithCollate()
return enableStringPushdownWithCollate;
}

@Config("postgresql.experimental.enable-string-pushdown-with-collate")
@Config("postgresql.enable-string-pushdown-with-collate")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it require docs update in this PR or in a follow-up?

@LegacyConfig("postgresql.experimental.enable-string-pushdown-with-collate")
public PostgreSqlConfig setEnableStringPushdownWithCollate(boolean enableStringPushdownWithCollate)
{
this.enableStringPushdownWithCollate = enableStringPushdownWithCollate;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void testDefaults()
assertRecordedDefaults(recordDefaults(PostgreSqlConfig.class)
.setArrayMapping(PostgreSqlConfig.ArrayMapping.DISABLED)
.setIncludeSystemTables(false)
.setEnableStringPushdownWithCollate(false));
.setEnableStringPushdownWithCollate(true));
}

@Test
Expand All @@ -39,13 +39,13 @@ public void testExplicitPropertyMappings()
Map<String, String> properties = ImmutableMap.<String, String>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);
}
Expand Down