Merge pull request #230 from conveyal/dev

Bug fix release
conveyal · May 2, 2019 · 022b5d4 · 022b5d4
2 parents ba9e195 + f1c46da
commit 022b5d4
Show file tree

Hide file tree

Showing 24 changed files with 11 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ before_install: |
 
 # Install semantic-release
 before_script:
-  - yarn global add @conveyal/maven-semantic-release semantic-release
+  - yarn global add @conveyal/maven-semantic-release semantic-release@15
 
 # Replace Travis's default build step.
 # Run all Maven phases at once up through verify, install, and deploy.

diff --git a/pom.xml b/pom.xml
@@ -261,12 +261,14 @@
       <groupId>org.hamcrest</groupId>
       <artifactId>java-hamcrest</artifactId>
       <version>2.0.0.0</version>
+      <scope>test</scope>
     </dependency>
     <!-- Snapshotting library for testing -->
     <dependency>
-      <groupId>com.github.Zenika</groupId>
+      <groupId>com.github.conveyal</groupId>
       <artifactId>java-snapshot-matcher</artifactId>
-      <version>7e6ed4049eb637334e56f84bdd23ea74da05f141</version>
+      <version>3495b32f7b4d3f82590e0a2284029214070b6984</version>
+      <scope>test</scope>
     </dependency>
     <!-- Disk-backed storage that looks like a Java map. -->
     <dependency>

diff --git a/src/main/java/com/conveyal/gtfs/loader/Field.java b/src/main/java/com/conveyal/gtfs/loader/Field.java
@@ -91,7 +91,6 @@ public String getSqlDeclaration() {
         return String.join(" ", name, getSqlTypeName());
     }
 
-    // TODO test for input with tabs, newlines, carriage returns, and slashes in it.
     protected static ValidateFieldResult<String> cleanString (String string) {
         return cleanString(new ValidateFieldResult<>(string));
     }
@@ -106,7 +105,12 @@ protected static ValidateFieldResult<String> cleanString (ValidateFieldResult<St
                 result.clean = result.clean.replace(illegalChar.illegalSequence, illegalChar.replacement);
                 // We don't know the Table or line number here, but when the errors bubble up, these values should be
                 // assigned to the errors.
-                result.errors.add(NewGTFSError.forFeed(NewGTFSErrorType.ILLEGAL_FIELD_VALUE, illegalChar.description));
+                if (!illegalChar.illegalSequence.equals("\\")) {
+                    // Do not include error entry for unescaped backslash. While this character
+                    // sequence is problematic for Postgres, it is not technically an illegal
+                    // value according to the GTFS specification.
+                    result.errors.add(NewGTFSError.forFeed(NewGTFSErrorType.ILLEGAL_FIELD_VALUE, illegalChar.description));
+                }
             }
         }
         return result;

diff --git a/...hql/GTFSGraphQLTest/canFetchAgencies.json → ...l/GTFSGraphQLTest/canFetchAgencies-0.json b/...hql/GTFSGraphQLTest/canFetchAgencies.json → ...l/GTFSGraphQLTest/canFetchAgencies-0.json
diff --git a/...ql/GTFSGraphQLTest/canFetchCalendars.json → .../GTFSGraphQLTest/canFetchCalendars-0.json b/...ql/GTFSGraphQLTest/canFetchCalendars.json → .../GTFSGraphQLTest/canFetchCalendars-0.json
diff --git a/...aphql/GTFSGraphQLTest/canFetchErrors.json → ...hql/GTFSGraphQLTest/canFetchErrors-0.json b/...aphql/GTFSGraphQLTest/canFetchErrors.json → ...hql/GTFSGraphQLTest/canFetchErrors-0.json
diff --git a/...raphql/GTFSGraphQLTest/canFetchFares.json → ...phql/GTFSGraphQLTest/canFetchFares-0.json b/...raphql/GTFSGraphQLTest/canFetchFares.json → ...phql/GTFSGraphQLTest/canFetchFares-0.json
diff --git a/...graphql/GTFSGraphQLTest/canFetchFeed.json → ...aphql/GTFSGraphQLTest/canFetchFeed-0.json b/...graphql/GTFSGraphQLTest/canFetchFeed.json → ...aphql/GTFSGraphQLTest/canFetchFeed-0.json
diff --git a/...hql/GTFSGraphQLTest/canFetchFeedInfo.json → ...l/GTFSGraphQLTest/canFetchFeedInfo-0.json b/...hql/GTFSGraphQLTest/canFetchFeedInfo.json → ...l/GTFSGraphQLTest/canFetchFeedInfo-0.json
diff --git a/...TFSGraphQLTest/canFetchFeedRowCounts.json → ...SGraphQLTest/canFetchFeedRowCounts-0.json b/...TFSGraphQLTest/canFetchFeedRowCounts.json → ...SGraphQLTest/canFetchFeedRowCounts-0.json
diff --git a/...phQLTest/canFetchMultiNestedEntities.json → ...QLTest/canFetchMultiNestedEntities-0.json b/...phQLTest/canFetchMultiNestedEntities.json → ...QLTest/canFetchMultiNestedEntities-0.json
diff --git a/...etchMultiNestedEntitiesWithoutLimits.json → ...chMultiNestedEntitiesWithoutLimits-0.json b/...etchMultiNestedEntitiesWithoutLimits.json → ...chMultiNestedEntitiesWithoutLimits-0.json
diff --git a/...QLTest/canFetchNestedEntityWithLimit.json → ...Test/canFetchNestedEntityWithLimit-0.json b/...QLTest/canFetchNestedEntityWithLimit.json → ...Test/canFetchNestedEntityWithLimit-0.json
diff --git a/...hql/GTFSGraphQLTest/canFetchPatterns.json → ...l/GTFSGraphQLTest/canFetchPatterns-0.json b/...hql/GTFSGraphQLTest/canFetchPatterns.json → ...l/GTFSGraphQLTest/canFetchPatterns-0.json
diff --git a/...aphql/GTFSGraphQLTest/canFetchRoutes.json → ...hql/GTFSGraphQLTest/canFetchRoutes-0.json b/...aphql/GTFSGraphQLTest/canFetchRoutes.json → ...hql/GTFSGraphQLTest/canFetchRoutes-0.json
diff --git a/...tchRoutesAndFilterTripsByDateAndTime.json → ...hRoutesAndFilterTripsByDateAndTime-0.json b/...tchRoutesAndFilterTripsByDateAndTime.json → ...hRoutesAndFilterTripsByDateAndTime-0.json
diff --git a/...hql/GTFSGraphQLTest/canFetchServices.json → ...l/GTFSGraphQLTest/canFetchServices-0.json b/...hql/GTFSGraphQLTest/canFetchServices.json → ...l/GTFSGraphQLTest/canFetchServices-0.json
diff --git a/...ql/GTFSGraphQLTest/canFetchStopTimes.json → .../GTFSGraphQLTest/canFetchStopTimes-0.json b/...ql/GTFSGraphQLTest/canFetchStopTimes.json → .../GTFSGraphQLTest/canFetchStopTimes-0.json
diff --git a/...GraphQLTest/canFetchStopWithChildren.json → ...aphQLTest/canFetchStopWithChildren-0.json b/...GraphQLTest/canFetchStopWithChildren.json → ...aphQLTest/canFetchStopWithChildren-0.json
diff --git a/...raphql/GTFSGraphQLTest/canFetchStops.json → ...phql/GTFSGraphQLTest/canFetchStops-0.json b/...raphql/GTFSGraphQLTest/canFetchStops.json → ...phql/GTFSGraphQLTest/canFetchStops-0.json
diff --git a/...FetchStopsWithoutParentStationColumn.json → ...tchStopsWithoutParentStationColumn-0.json b/...FetchStopsWithoutParentStationColumn.json → ...tchStopsWithoutParentStationColumn-0.json
diff --git a/...raphql/GTFSGraphQLTest/canFetchTrips.json → ...phql/GTFSGraphQLTest/canFetchTrips-0.json b/...raphql/GTFSGraphQLTest/canFetchTrips.json → ...phql/GTFSGraphQLTest/canFetchTrips-0.json
diff --git a/...t/canSanitizeSQLInjectionSentAsInput.json → ...canSanitizeSQLInjectionSentAsInput-0.json b/...t/canSanitizeSQLInjectionSentAsInput.json → ...canSanitizeSQLInjectionSentAsInput-0.json
diff --git a/...anSanitizeSQLInjectionSentAsKeyValue.json → ...SanitizeSQLInjectionSentAsKeyValue-0.json b/...anSanitizeSQLInjectionSentAsKeyValue.json → ...SanitizeSQLInjectionSentAsKeyValue-0.json