Update Models

Censio · Nov 23, 2015 · cc46557 · cc46557
1 parent 7e02d42
commit cc46557
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/gtfsdb/model/fare.py b/gtfsdb/model/fare.py
@@ -33,7 +33,7 @@ class FareRule(Base):
 
     __tablename__ = 'gtfs_fare_rules'
 
-    id = Column(Integer, Sequence(None, optional=True), primary_key=True, nullable=True)
+    id = Column(GUID(), primary_key=True, nullable=True)
     fare_id = Column(GUID(), nullable=False)
     route_id = Column(GUID(), nullable=False)
     origin_id = Column(GUID())

diff --git a/gtfsdb/model/frequency.py b/gtfsdb/model/frequency.py
@@ -14,7 +14,7 @@ class Frequency(Base):
 
     __tablename__ = 'gtfs_frequencies'
 
-    id = Column(Integer, Sequence(None, optional=True), primary_key=True, nullable=True)
+    id = Column(GUID(), primary_key=True, nullable=True)
     trip_id = Column(GUID(), nullable=False)
     start_time = Column(String(8))
     end_time = Column(String(8))

diff --git a/gtfsdb/model/route.py b/gtfsdb/model/route.py
@@ -161,7 +161,7 @@ class RouteDirection(Base):
 
     __tablename__ = 'gtfs_directions'
 
-    id = Column(Integer, Sequence(None, optional=True), primary_key=True, nullable=True)
+    id = Column(GUID(), primary_key=True, nullable=True)
     direction_id = Column(GUID(), nullable=False)
     route_id = Column(GUID(), nullable=False)
     direction_name = Column(String(255))
@@ -174,7 +174,7 @@ class RouteStop(Base):
 
     __tablename__ = 'route_stops'
 
-    id = Column(Integer, Sequence(None, optional=True), primary_key=True, nullable=True)
+    id = Column(GUID(), primary_key=True, nullable=True)
     route_id = Column(GUID(), nullable=False)
     direction_id = Column(GUID(), nullable=False)
     stop_id = Column(GUID(), nullable=False)

diff --git a/gtfsdb/model/shape.py b/gtfsdb/model/shape.py
@@ -81,7 +81,7 @@ class Shape(Base):
 
     __tablename__ = 'gtfs_shapes'
 
-    id = Column(Integer, Sequence(None, optional=True), primary_key=True, nullable=True)
+    id = Column(GUID(), primary_key=True, nullable=True)
     shape_id = Column(GUID(), nullable=False)
     shape_pt_lat = Column(Numeric(12, 9), nullable=False)
     shape_pt_lon = Column(Numeric(12, 9), nullable=False)

diff --git a/gtfsdb/model/stop_feature.py b/gtfsdb/model/stop_feature.py
@@ -17,7 +17,7 @@ class StopFeature(Base):
 
     __tablename__ = 'stop_features'
 
-    id = Column(Integer, Sequence(None, optional=True), primary_key=True, nullable=True)
+    id = Column(GUID(), primary_key=True, nullable=True)
     stop_id = Column(GUID(), nullable=False)
     feature_type = Column(String(50), nullable=False)
     feature_name = Column(String(255))

diff --git a/gtfsdb/model/stop_time.py b/gtfsdb/model/stop_time.py
@@ -19,7 +19,7 @@ class StopTime(Base):
     filename = 'stop_times.txt'
 
     __tablename__ = 'gtfs_stop_times'
-    id = Column(Integer, Sequence(None, optional=True), primary_key=True, nullable=True)
+    id = Column(GUID(), primary_key=True, nullable=True)
     stop_id = Column(GUID(), nullable=False)
     trip_id = Column(GUID(), nullable=False)
     arrival_time = Column(String(8))

diff --git a/gtfsdb/model/transfer.py b/gtfsdb/model/transfer.py
@@ -12,7 +12,7 @@ class Transfer(Base):
 
     __tablename__ = 'gtfs_transfers'
 
-    id = Column(Integer, Sequence(None, optional=True), primary_key=True, nullable=True)
+    id = Column(GUID(), primary_key=True, nullable=True)
     from_stop_id = Column(GUID(), nullable=False)
     to_stop_id = Column(GUID(), nullable=False)
     transfer_type = Column(Integer, default=0)