[
https://issues.apache.org/jira/browse/GEODE-4257?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16327788#comment-16327788
]
ASF GitHub Bot commented on GEODE-4257:
---------------------------------------
dschneider-pivotal closed pull request #1261: GEODE-4257: change default of
value-contains-primary-key
URL: https://github.com/apache/geode/pull/1261
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
index 703ca7cc8f..6186ec803f 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
@@ -75,7 +75,7 @@ public Result createMapping(
@CliOption(key = CREATE_MAPPING__PDX_CLASS_NAME,
help = CREATE_MAPPING__PDX_CLASS_NAME__HELP) String pdxClassName,
@CliOption(key = CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY,
- help = CREATE_MAPPING__PRIMARY_KEY_IN_VALUE__HELP,
unspecifiedDefaultValue = "true",
+ help = CREATE_MAPPING__PRIMARY_KEY_IN_VALUE__HELP,
unspecifiedDefaultValue = "false",
specifiedDefaultValue = "true") boolean keyInValue,
@CliOption(key = CREATE_MAPPING__FIELD_MAPPING,
help = CREATE_MAPPING__FIELD_MAPPING__HELP) String[] fieldMappings) {
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDUnitTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDUnitTest.java
index ea1878ffec..adeb48d0e0 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDUnitTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDUnitTest.java
@@ -272,8 +272,8 @@ private void createRegion(boolean withCacheWriter, boolean
withAsyncWriter, bool
}
private void createMapping(String regionName, String connectionName) {
- final String commandStr =
- "create jdbc-mapping --region=" + regionName + " --connection=" +
connectionName;
+ final String commandStr = "create jdbc-mapping --region=" + regionName + "
--connection="
+ + connectionName + " --value-contains-primary-key";
gfsh.executeAndAssertThat(commandStr).statusIsSuccess();
}
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
index 552cd237fd..a811f2ba29 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
@@ -63,13 +63,13 @@ public void before() throws Exception {
}
@Test
- public void createsConnection() {
+ public void createsMappingWithAllOptions() {
CommandStringBuilder csb = new CommandStringBuilder(CREATE_MAPPING);
csb.addOption(CREATE_MAPPING__REGION_NAME, "testRegion");
csb.addOption(CREATE_MAPPING__CONNECTION_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "myTable");
csb.addOption(CREATE_MAPPING__PDX_CLASS_NAME, "myPdxClass");
- csb.addOption(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY, "false");
+ csb.addOption(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY, "true");
csb.addOption(CREATE_MAPPING__FIELD_MAPPING,
"field1:column1,field2:column2");
gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
@@ -77,9 +77,39 @@ public void createsConnection() {
locator.invoke(() -> {
String xml =
InternalLocator.getLocator().getSharedConfiguration().getConfiguration("cluster")
.getCacheXmlContent();
- assertThat(xml).isNotNull().contains("jdbc:connector-service");
- assertThat(xml).isNotNull().contains("jdbc:region-mapping");
- assertThat(xml).isNotNull().contains("jdbc:field-mapping");
+ assertThat(xml).isNotNull().contains("jdbc:connector-service")
+ .doesNotContain("jdbc:connection").contains("jdbc:region-mapping")
+ .contains("jdbc:field-mapping");
+ });
+
+ server.invoke(() -> {
+ InternalCache cache = ClusterStartupRule.getCache();
+ RegionMapping mapping =
+
cache.getService(JdbcConnectorService.class).getMappingForRegion("testRegion");
+ assertThat(mapping.getConnectionConfigName()).isEqualTo("connection");
+ assertThat(mapping.getTableName()).isEqualTo("myTable");
+ assertThat(mapping.getPdxClassName()).isEqualTo("myPdxClass");
+ assertThat(mapping.isPrimaryKeyInValue()).isEqualTo(true);
+ assertThat(mapping.getFieldToColumnMap()).containsEntry("field1",
"column1")
+ .containsEntry("field2", "column2");
+ });
+ }
+
+ @Test
+ public void validateThatPrimaryKeyInValueDefaultsToFalse() {
+ CommandStringBuilder csb = new CommandStringBuilder(CREATE_MAPPING);
+ csb.addOption(CREATE_MAPPING__REGION_NAME, "testRegion");
+ csb.addOption(CREATE_MAPPING__CONNECTION_NAME, "connection");
+ csb.addOption(CREATE_MAPPING__TABLE_NAME, "myTable");
+ csb.addOption(CREATE_MAPPING__PDX_CLASS_NAME, "myPdxClass");
+ csb.addOption(CREATE_MAPPING__FIELD_MAPPING,
"field1:column1,field2:column2");
+
+ gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
+
+ locator.invoke(() -> {
+ String xml =
InternalLocator.getLocator().getSharedConfiguration().getConfiguration("cluster")
+ .getCacheXmlContent();
+ assertThat(xml).isNotNull().contains("primary-key-in-value=\"false\"");
});
server.invoke(() -> {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> gfsh jdbc-mapping defaults to true for --primary-key-in-value
> -------------------------------------------------------------
>
> Key: GEODE-4257
> URL: https://issues.apache.org/jira/browse/GEODE-4257
> Project: Geode
> Issue Type: Bug
> Components: regions
> Reporter: Darrel Schneider
> Assignee: Darrel Schneider
> Priority: Major
> Labels: pull-request-available
>
> The gfsh jdbc-mapping defaults to true for --primary-key-in-value. It should
> default to false.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
