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

Editor: Allow null values for foreign ref fields or required fields where permitted #133

Merged
merged 11 commits into from
Nov 8, 2018
Merged

Editor: Allow null values for foreign ref fields or required fields where permitted #133

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d63d0fb
fix(editor): allow null values for foreign ref fields allowed to be e…
landonreed Aug 23, 2018
8189831
Merge branch 'dev' into fix-fare-rule-no-route
landonreed Oct 15, 2018
40ef82d
fix(editor): permit empty values if required field allows it
landonreed Oct 16, 2018
5b87be8
fix(snapshot): check for null namespace in tableExists method
landonreed Oct 16, 2018
49b4611
test: tweak javadoc
landonreed Oct 16, 2018
305df47
test(editor): add basic CRUD test for fares
landonreed Oct 16, 2018
a6943aa
test: add FareDTO class
landonreed Oct 16, 2018
78a7785
test(editor): add simple checks for fare_rules
landonreed Oct 16, 2018
795fdcb
refactor(test): change FareDTO#transfer_duration to Integer
landonreed Oct 16, 2018
fbadc7b
test(editor): add CRUD routes test
landonreed Oct 16, 2018
d10aff3
test: address PR comments
landonreed Nov 8, 2018
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
6 changes: 5 additions & 1 deletion 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 @@ -421,7 +421,11 @@ private void updateChildTable(ArrayNode subEntities, Integer id, boolean isCreat
// field statement above.
for (Field field : subTable.specFields()) {
if (field.referenceTable != null && !field.referenceTable.name.equals(specTable.name)) {
referencesPerTable.put(field.referenceTable, subEntity.get(field.name).asText());
JsonNode refValueNode = subEntity.get(field.name);
// Skip over references that are null but not required (e.g., route_id in fare_rules).
if (refValueNode.isNull() && !field.isRequired()) continue;
String refValue = refValueNode.asText();
referencesPerTable.put(field.referenceTable, refValue);
}
}
// Insert new sub-entity.
Expand Down