Merge pull request #158 from conveyal/dev

Bug fix release

.travis.yml

@@ -65,4 +65,4 @@ notifications:
 # Push results to codecov.io and run semantic-release (releases only created on pushes to the master branch).
 after_success:
   - bash <(curl -s https://codecov.io/bash)
-  - semantic-release --prepare @conveyal/maven-semantic-release --publish @semantic-release/github,@conveyal/maven-semantic-release --verify-conditions @semantic-release/github --verify-release @conveyal/maven-semantic-release
+  - semantic-release --prepare @conveyal/maven-semantic-release --publish @semantic-release/github,@conveyal/maven-semantic-release --verify-conditions @semantic-release/github,@conveyal/maven-semantic-release --verify-release @conveyal/maven-semantic-release --use-conveyal-workflow --dev-branch=dev

src/main/java/com/conveyal/gtfs/GTFS.java

@@ -184,7 +184,7 @@ public static void main (String[] args) throws IOException {
         try {
             cmd = new DefaultParser().parse(options, args);
         } catch (ParseException e) {
-            LOG.error("Error parsing command line: " + e.getMessage());
+            LOG.error("Error parsing command line", e);
             printHelp(options);
             return;
         }

src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java

@@ -119,6 +119,7 @@ public class GraphQLGtfsSchema {
     public static final GraphQLObjectType fareType = newObject().name("fare_attributes")
             .description("A GTFS agency object")
             .field(MapFetcher.field("id", GraphQLInt))
+            .field(MapFetcher.field("agency_id"))
             .field(MapFetcher.field("fare_id"))
             .field(MapFetcher.field("price", GraphQLFloat))
             .field(MapFetcher.field("currency_type"))
@@ -269,6 +270,7 @@ public class GraphQLGtfsSchema {
             .field(MapFetcher.field("wheelchair_accessible"))
             .field(MapFetcher.field("publicly_visible", GraphQLInt))
             .field(MapFetcher.field("status", GraphQLInt))
+            .field(MapFetcher.field("route_sort_order"))
             // FIXME ^^
             .field(RowCountFetcher.field("trip_count", "trips", "route_id"))
             .field(RowCountFetcher.field("pattern_count", "patterns", "route_id"))

src/main/java/com/conveyal/gtfs/loader/Table.java

@@ -695,7 +695,14 @@ public boolean isRequired () {
      * FIXME: add foreign reference indexes?
      */
     public void createIndexes(Connection connection, String namespace) throws SQLException {
-        LOG.info("Indexing...");
+        if ("agency".equals(name) || "feed_info".equals(name)) {
+            // Skip indexing for the small tables that have so few records that indexes are unlikely to
+            // improve query performance or that are unlikely to be joined to other tables. NOTE: other tables could be
+            // added here in the future as needed.
+            LOG.info("Skipping indexes for {} table", name);
+            return;
+        }
+        LOG.info("Indexing {}...", name);
         String tableName;
         if (namespace == null) {
             throw new IllegalStateException("Schema namespace must be provided!");