Small bug fixers

app/models/delivery.py

@@ -1,6 +1,6 @@
-from sqlalchemy import (Column, Integer,
-        DECIMAL, Text,
-        VARCHAR, TIMESTAMP, Date)
+from sqlalchemy import (Column, INTEGER,
+        DECIMAL, TEXT,
+        VARCHAR, TIMESTAMP, DATE)
 import datetime
 from database import  Base
 
@@ -8,40 +8,41 @@ from database import  Base
 class Delivery(Base):
     __tablename__ = "delivery_delivery"
 
-    id = Column(Integer,
+    id = Column(INTEGER,
                    primary_key=True,
                    autoincrement=True,
                    unique=False)
     
-    customer_id = Column(Integer)
+    customer_id = Column(INTEGER)
     customer_name = Column(VARCHAR(1000))
     customer_address = Column(VARCHAR(1000))
     customer_town = Column(VARCHAR(140))
     customer_state = Column(VARCHAR(140))
-    customer_zip = Column(Integer)
+    customer_zip = Column(INTEGER)
  
-    gallons_ordered = Column(Integer)
-    customer_asked_for_fill = Column(Integer)
+    gallons_ordered = Column(INTEGER)
+    customer_asked_for_fill = Column(INTEGER)
     gallons_delivered = Column(DECIMAL(50, 2))
-    customer_filled = Column(Integer)
+    customer_filled = Column(INTEGER)
   
-    delivery_status = Column(Integer)
+    delivery_status = Column(INTEGER)
     when_ordered = Column(TIMESTAMP(), default=datetime.datetime.utcnow())
     when_delivered = Column(TIMESTAMP(), default=None)
-    expected_delivery_date = Column(Date(), default=None)
-    automatic = Column(Integer)
-    oil_id = Column(Integer)
+    expected_delivery_date = Column(DATE(), default=None)
+    automatic = Column(INTEGER)
+    automatic_id = Column(INTEGER)
+    oil_id = Column(INTEGER)
     supplier_price = Column(DECIMAL(50, 2))
     customer_price = Column(DECIMAL(50, 2))
     customer_temperature = Column(DECIMAL(50, 2))
-    dispatcher_notes = Column(Text())
-    prime = Column(Integer)
-    same_day = Column(Integer)
-    payment_type = Column(Integer)
-    payment_card_id = Column(Integer)
+    dispatcher_notes = Column(TEXT())
+    prime = Column(INTEGER)
+    same_day = Column(INTEGER)
+    payment_type = Column(INTEGER)
+    payment_card_id = Column(INTEGER)
     cash_recieved = Column(DECIMAL(50, 2))
     
-    driver_employee_id = Column(Integer)
+    driver_employee_id = Column(INTEGER)
     driver_first_name = Column(VARCHAR(140))
     driver_last_name = Column(VARCHAR(140))