diff --git a/odm2api/models.py b/odm2api/models.py index 3c7a4d1..82799e4 100644 --- a/odm2api/models.py +++ b/odm2api/models.py @@ -14,7 +14,7 @@ BigIntegerType = BigIntegerType.with_variant(mysql.BIGINT(), 'mysql') DateTimeType = DateTime() -DateTimeType = DateTimeType.with_variant(sqlite.INTEGER(), 'sqlite') +DateTimeType = DateTimeType.with_variant(sqlite.DATETIME(), 'sqlite') def is_hex(s): diff --git a/tests/test_odm2/data/populated.sql b/tests/test_odm2/data/populated.sql index 84a1e23..c9f8689 100644 --- a/tests/test_odm2/data/populated.sql +++ b/tests/test_odm2/data/populated.sql @@ -11541,47 +11541,47 @@ INSERT INTO "TimeSeriesResultValues" VALUES(9982,1,11.9,'2014-12-31 23:30:00',-7 INSERT INTO "TimeSeriesResultValues" VALUES(9983,1,11.9,'2014-12-31 23:45:00',-7,'nc','Unknown',0.0,102); INSERT INTO "TimeSeriesResultValues" VALUES(9984,1,11.9,'2014-12-31 23:45:00',-7,'nc','Unknown',0.0,102); INSERT INTO "TimeSeriesResultValues" VALUES(9985,1,11.9,'2015-01-01 00:00:00',-7,'nc','Unknown',0.0,102); -INSERT INTO "TimeSeriesResultValues" VALUES(9986,1,184.0,'2013-06-15',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9987,1,200.0,'2013-05-06',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9988,1,201.0,'2013-06-14',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9989,1,208.0,'2013-06-13',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9990,1,214.0,'2013-05-07',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9991,1,221.0,'2013-06-12',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9992,1,229.0,'2013-05-08',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9993,1,233.0,'2013-05-09',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9994,1,242.0,'2013-06-06',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9995,1,243.0,'2013-06-07',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9996,1,245.0,'2013-06-11',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9997,1,249.0,'2013-06-02',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9998,1,251.0,'2013-06-08',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(9999,1,254.0,'2013-06-01',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10000,1,256.0,'2013-06-10',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10001,1,258.0,'2013-06-05',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10002,1,260.0,'2013-06-09',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10003,1,263.0,'2013-06-03',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10004,1,265.0,'2013-05-10',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10005,1,265.0,'2013-06-04',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10006,1,270.0,'2013-05-31',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10007,1,291.0,'2013-05-11',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10008,1,306.0,'2013-05-30',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10009,1,315.0,'2013-05-27',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10010,1,316.0,'2013-05-12',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10011,1,317.0,'2013-05-29',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10012,1,320.0,'2013-05-25',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10013,1,321.0,'2013-05-28',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10014,1,322.0,'2013-05-26',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10015,1,338.0,'2013-05-24',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10016,1,341.0,'2013-05-22',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10017,1,346.0,'2013-05-21',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10018,1,347.0,'2013-05-23',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10019,1,358.0,'2013-05-13',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10020,1,367.0,'2013-05-20',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10021,1,393.0,'2013-05-19',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10022,1,422.0,'2013-05-14',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10023,1,453.0,'2013-05-18',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10024,1,458.0,'2013-05-15',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10025,1,478.0,'2013-05-16',-6,'nc','provisional',0.0,204); -INSERT INTO "TimeSeriesResultValues" VALUES(10026,1,480.0,'2013-05-17',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9986,1,184.0,'2013-06-15 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9987,1,200.0,'2013-05-06 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9988,1,201.0,'2013-06-14 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9989,1,208.0,'2013-06-13 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9990,1,214.0,'2013-05-07 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9991,1,221.0,'2013-06-12 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9992,1,229.0,'2013-05-08 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9993,1,233.0,'2013-05-09 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9994,1,242.0,'2013-06-06 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9995,1,243.0,'2013-06-07 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9996,1,245.0,'2013-06-11 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9997,1,249.0,'2013-06-02 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9998,1,251.0,'2013-06-08 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(9999,1,254.0,'2013-06-01 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10000,1,256.0,'2013-06-10 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10001,1,258.0,'2013-06-05 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10002,1,260.0,'2013-06-09 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10003,1,263.0,'2013-06-03 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10004,1,265.0,'2013-05-10 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10005,1,265.0,'2013-06-04 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10006,1,270.0,'2013-05-31 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10007,1,291.0,'2013-05-11 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10008,1,306.0,'2013-05-30 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10009,1,315.0,'2013-05-27 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10010,1,316.0,'2013-05-12 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10011,1,317.0,'2013-05-29 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10012,1,320.0,'2013-05-25 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10013,1,321.0,'2013-05-28 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10014,1,322.0,'2013-05-26 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10015,1,338.0,'2013-05-24 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10016,1,341.0,'2013-05-22 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10017,1,346.0,'2013-05-21 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10018,1,347.0,'2013-05-23 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10019,1,358.0,'2013-05-13 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10020,1,367.0,'2013-05-20 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10021,1,393.0,'2013-05-19 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10022,1,422.0,'2013-05-14 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10023,1,453.0,'2013-05-18 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10024,1,458.0,'2013-05-15 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10025,1,478.0,'2013-05-16 00:00:00',-6,'nc','provisional',0.0,204); +INSERT INTO "TimeSeriesResultValues" VALUES(10026,1,480.0,'2013-05-17 00:00:00',-6,'nc','provisional',0.0,204); INSERT INTO "TimeSeriesResultValues" VALUES(10027,2,0.0,'02/07/2013 00:00:00',-5,'nc','provisional',1.0,206); INSERT INTO "TimeSeriesResultValues" VALUES(10028,2,0.254,'02/07/2013 00:01:00',-5,'nc','provisional',1.0,206); INSERT INTO "TimeSeriesResultValues" VALUES(10029,2,0.254,'02/07/2013 00:02:00',-5,'nc','provisional',1.0,206); diff --git a/tests/test_odm2/test_readservice.py b/tests/test_odm2/test_readservice.py index f1189aa..3e7189f 100644 --- a/tests/test_odm2/test_readservice.py +++ b/tests/test_odm2/test_readservice.py @@ -2,8 +2,8 @@ from os.path import abspath, dirname, join -from odm2api.ODM2 import models -from odm2api.ODM2.services.readService import ReadODM2 +from odm2api import models +from odm2api.services.readService import ReadODM2 from odm2api.ODMconnection import dbconnection import pytest @@ -11,6 +11,8 @@ import sqlalchemy from sqlalchemy.orm import class_mapper +skipif = pytest.mark.skipif + globals_vars = {}