Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add route GTFS shortnames to pattern stop error message #396

Merged
merged 7 commits into from
Sep 27, 2023
Merged

Add route GTFS shortnames to pattern stop error message #396

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ec341c2
feat(JdbcTableWriter): Add route Ids to pattern stop error message
philip-cline Sep 1, 2023
5e64021
refactor(JdbcTableWriter): Add route shortnames to pattern stop error…
philip-cline Sep 1, 2023
c4959ac
refactor(JdbcTableWriter): Add missing dash
philip-cline Sep 20, 2023
b685f83
refactor(JdbcTableWriter): Add GTFS route id
philip-cline Sep 26, 2023
a7bcafc
refactor(JdbcTableWriter): allow nulls
philip-cline Sep 26, 2023
1a4367e
refactor(JdbcTableWriter): fix allowing nulls
philip-cline Sep 26, 2023
d246963
refactor(JdbcTableWriter): use String.format
philip-cline Sep 27, 2023
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
9 changes: 7 additions & 2 deletions src/main/java/com/conveyal/gtfs/loader/JdbcTableWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1483,6 +1483,11 @@ private String[] parseExceptionListField(int id, String namespace, Table table,
return parsedString.replaceAll("[{}]", "").split("[,]", 0);
}

private String getResultSetString(int column, ResultSet resultSet) throws java.sql.SQLException {
String resultSetString = resultSet.getString(column);
return resultSetString == null ? "" : resultSetString;
}

/**
* Delete all entries in calendar dates associated with a schedule exception.
*/
Expand Down Expand Up @@ -1579,7 +1584,7 @@ private void updateReferencingTables(
connection.rollback();
if (entityClass.getSimpleName().equals("Stop")) {
String patternStopLookup = String.format(
"select distinct p.id, r.id " +
"select distinct p.id, r.id, r.route_short_name, r.route_id " +
"from %s.pattern_stops ps " +
"inner join " +
"%s.patterns p " +
Expand All @@ -1599,7 +1604,7 @@ private void updateReferencingTables(
ResultSet resultSet = patternStopSelectStatement.getResultSet();
while (resultSet.next()) {
patternAndRouteIds.add(
"{" + resultSet.getString(1) + "-" + resultSet.getString(2) + "}"
"{" + getResultSetString(1, resultSet) + "-" + getResultSetString(2, resultSet) + "-" + getResultSetString(3, resultSet)+ "-" + getResultSetString(4, resultSet) + "}"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you replace all of these concatenations with String.format ?

);
}
}
Expand Down
Loading