ReceiverDevice to Receiver

alembic/versions/104107d119d_receiver_device_to_receiver.py

@@ -0,0 +1,24 @@
+"""receiver_device to receiver
+
+Revision ID: 104107d119d
+Revises: 46bc73c49e0
+Create Date: 2015-11-16 20:07:19.569378
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '104107d119d'
+down_revision = '46bc73c49e0'
+branch_labels = None
+depends_on = None
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.rename_table('receiver_device', 'receiver')
+
+
+def downgrade():
+    op.rename_table('receiver', 'receiver_device')

ogn/commands/showreceiver.py

@@ -3,7 +3,7 @@ from datetime import datetime, timedelta
 from sqlalchemy.sql import func
 from sqlalchemy import distinct, and_
 
-from ogn.model import ReceiverBeacon, ReceiverDevice
+from ogn.model import ReceiverBeacon, Receiver
 
 from ogn.commands.dbutils import session
 
@@ -22,9 +22,9 @@ def list_all():
         group_by(ReceiverBeacon.name).\
         subquery()
 
-    query = session.query(ReceiverDevice, sq.c.messages_count).\
+    query = session.query(Receiver, sq.c.messages_count).\
-        filter(ReceiverDevice.name == sq.c.name).\
+        filter(Receiver.name == sq.c.name).\
-        order_by(ReceiverDevice.name)
+        order_by(Receiver.name)
 
     print('--- Receivers ---')
     for [receiver, messages_count] in query.all():

ogn/model/__init__.py

@@ -5,5 +5,5 @@ from .beacon import Beacon
 from .device import Device
 from .aircraft_beacon import AircraftBeacon
 from .receiver_beacon import ReceiverBeacon
-from .receiver_device import ReceiverDevice
+from .receiver import Receiver
 from .takeoff_landing import TakeoffLanding

ogn/model/receiver.py

@@ -3,8 +3,8 @@ from sqlalchemy import Column, String, Integer, Float, DateTime
 from .base import Base
 
 
-class ReceiverDevice(Base):
+class Receiver(Base):
-    __tablename__ = "receiver_device"
+    __tablename__ = "receiver"
 
     id = Column(Integer, primary_key=True)
     name = Column(String(9))