Mercurial > buscompiler / file diff

--- a/datamodel.py	Wed Jul 29 23:45:53 2020 +0300
+++ b/datamodel.py	Thu Jul 30 21:52:31 2020 +0300
@@ -39,17 +39,47 @@
 class GtfsRegion(GtfsBase):
 	# Not a gtfs data set, but the Gtfs prefix added for consistency
 	__tablename__ = 'regions'
-	region_name = sqlalchemy.Column(sqlalchemy.String, primary_key = True)
+	ref = sqlalchemy.Column(sqlalchemy.String, primary_key = True)
+	region_name_fi = sqlalchemy.Column(sqlalchemy.String, nullable = False)
 	region_name_sv = sqlalchemy.Column(sqlalchemy.String)
 	region_name_en = sqlalchemy.Column(sqlalchemy.String)
 	region_name_ja = sqlalchemy.Column(sqlalchemy.String)
-	region_short_name = sqlalchemy.Column(sqlalchemy.String)
+	region_short_name_fi = sqlalchemy.Column(sqlalchemy.String)
 	region_short_name_sv = sqlalchemy.Column(sqlalchemy.String)
 	region_short_name_en = sqlalchemy.Column(sqlalchemy.String)
 	region_short_name_ja = sqlalchemy.Column(sqlalchemy.String)
-	region_internal_name = sqlalchemy.Column(sqlalchemy.String)
+	region_internal_name_fi = sqlalchemy.Column(sqlalchemy.String)
 	region_internal_name_sv = sqlalchemy.Column(sqlalchemy.String)
 	region_internal_name_en = sqlalchemy.Column(sqlalchemy.String)
 	region_internal_name_ja = sqlalchemy.Column(sqlalchemy.String)
 	municipality = sqlalchemy.Column(sqlalchemy.String, nullable = False)
 	external = sqlalchemy.Column(sqlalchemy.Boolean)
+
+class GtfsStopTime(GtfsBase):
+	__tablename__ = 'stop_times'
+	trip_id = sqlalchemy.Column(
+		sqlalchemy.String,
+		sqlalchemy.ForeignKey(GtfsTrip.id),
+		primary_key = True,
+	)
+	stop_id = sqlalchemy.Column(
+		sqlalchemy.String,
+		sqlalchemy.ForeignKey(GtfsStop.stop_id),
+		nullable = False,
+	)
+	stop_sequence = sqlalchemy.Column(
+		sqlalchemy.Integer,
+		primary_key = True,
+	)
+	arrival_time = sqlalchemy.Column(sqlalchemy.Interval, nullable = False)
+	departure_time = sqlalchemy.Column(sqlalchemy.Interval, nullable = False)
+	shape_distance_traveled = sqlalchemy.Column(sqlalchemy.Numeric)
+	destination = sqlalchemy.Column(sqlalchemy.String)
+	stop = sqlalchemy.orm.relationship(
+		'GtfsStop',
+		foreign_keys = 'GtfsStopTime.stop_id',
+	)
+	trip = sqlalchemy.orm.relationship(
+		'GtfsTrip',
+		foreign_keys = 'GtfsStopTime.trip_id',
+	)