Skip to content

Commit

Permalink
Loosed Derived field name trap
Browse files Browse the repository at this point in the history
Loosened Datepart field name trap. Warning instead
  • Loading branch information
TerenceJWilson committed May 25, 2020
1 parent b8d407c commit 446df05
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<description>Analytics Cloud Datatset Utils</description>
<artifactId>datasetutils</artifactId>
<packaging>jar</packaging>
<version>48.1.0-SNAPSHOT</version>
<version>48.1.0</version>
<url>https://github.com/forcedotcom/Analytics-Cloud-Dataset-Utils</url>
<organization>
<name>salesforce.com</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,11 @@ private static void validateSchema(ExternalFileSchema schema, PrintStream logger
for(FieldType user_field_2:user_fields)
{
if(user_field_2 !=null && user_field_2.getType()!=null && user_field_2.getType().equalsIgnoreCase("date") && user_field.getName().contains(user_field_2.getName()))
{
message.append("field name {"+user_field.getName()+"} not allowed. When there is field {"+user_field_2.getName()+"} of type Date\n");
{
//TJW remarking this error addition as error trap is too broad and caught legitimate field names
//More precise validation will be implemented TBD
// message.append("field name {"+user_field.getName()+"} not allowed. When there is field {"+user_field_2.getName()+"} of type Date\n");
logger.println("WARNING field name {"+user_field.getName()+"} may conflict with digest generated date part dimensions. When there is field {"+user_field_2.getName()+"} of type Date\n");
}
}
}
Expand Down

0 comments on commit 446df05

Please sign in to comment.