mirror
/
ogn-python
kopia lustrzana https://github.com/glidernet/ogn-python
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fixed broken logbook test

pull/68/head
Konstantin Gründger 2017-12-16 15:59:41 +01:00
rodzic 307278221a
commit eb7eda7eee
2 zmienionych plików z 3 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ogn/collect/logbook.py
Wyświetl plik

@ -112,7 +112,8 @@ def update_logbook(session=None):
and_(Logbook.takeoff_airport_id == null(),
Logbook.landing_airport_id == union_query.c.landing_airport_id,
Logbook.landing_timestamp == union_query.c.landing_timestamp)))) \
.values({"takeoff_timestamp": union_query.c.takeoff_timestamp,
.values({"reftime": union_query.c.reftime,
"takeoff_timestamp": union_query.c.takeoff_timestamp,
"takeoff_track": union_query.c.takeoff_track,
"takeoff_airport_id": union_query.c.takeoff_airport_id,
"landing_timestamp": union_query.c.landing_timestamp,
@ -152,7 +153,7 @@ def update_logbook(session=None):
session.commit()
logger.debug("New logbook entries: {}".format(insert_counter))
return "Logbook entries: {} inserted, {} updated".format(update_counter, insert_counter)
return "Logbook entries: {} inserted, {} updated".format(insert_counter, update_counter)
@app.task

2
ogn/model/device.py
Wyświetl plik

@ -16,8 +16,6 @@ class Device(Base):
software_version = Column(Float)
hardware_version = Column(SmallInteger)
real_address = Column(String(6))
firstseen = Column(DateTime, index=True)
lastseen = Column(DateTime, index=True)
# Relations
aircraft_beacons = relationship('AircraftBeacon')