diff --git a/.travis.yml b/.travis.yml index 422e41d..90deaea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,18 @@ language: python sudo: required +# if the https://travis-ci.org/ODM2/ODM2PythonAPI/requests ever says: missing config +# validate at: http://lint.travis-ci.org/ +python: +# - "2.6" + - "2.7" + - "3.2" + - "3.3" + - "3.4" + - "3.5" +# - "3.5-dev" # 3.5 development branch +# - "nightly" # currently points to 3.6-dev +# command to install dependencies cache: directories: - $HOME/miniconda diff --git a/odm2api/ODM2/models.py b/odm2api/ODM2/models.py index 7b6d5b2..1ad1d05 100644 --- a/odm2api/ODM2/models.py +++ b/odm2api/ODM2/models.py @@ -455,10 +455,10 @@ class DataLoggerProgramFiles(Base): class DataLoggerFiles(Base): DataLoggerFileID = Column('dataloggerfileid', Integer, primary_key=True, nullable=False) - ProgramID = Column('actionid', Integer, ForeignKey(DataLoggerProgramFiles.ProgramID), nullable=False) + ProgramID = Column('programid', Integer, ForeignKey(DataLoggerProgramFiles.ProgramID), nullable=False) DataLoggerFileName = Column('dataloggerfilename', String(255), nullable=False) - DataLoggerOutputFileDescription = Column('dataloggeroutputfiledescription', String(500)) - DataLoggerOutputFileLink = Column('dataloggeroutputfilelink', String(255)) + DataLoggerOutputFileDescription = Column('dataloggerfiledescription', String(500)) + DataLoggerOutputFileLink = Column('dataloggerfilelink', String(255)) ProgramObj = relationship(DataLoggerProgramFiles) @@ -511,7 +511,7 @@ class DataLoggerFileColumns(Base): nullable=False) ColumnLabel = Column('columnlabel', String(50), nullable=False) ColumnDescription = Column('columndescription', String(500)) - MeasurementEquation = Column('measurmentequation', String(255)) + MeasurementEquation = Column('measurementequation', String(255)) ScanInterval = Column('scaninterval', Float(50)) ScanIntervalUnitsID = Column('scanintervalunitsid', Integer, ForeignKey(Units.UnitsID)) RecordingInterval = Column('recordinginterval', Float(50))