Skip to content

Fix SQLite Result ValueDateTime data-type regression bug #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
emiliom wants to merge 2 commits into from
Closed

Fix SQLite Result ValueDateTime data-type regression bug #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b0f9ab
Fix SQLite datetime handling regression bug
emiliom Apr 16, 2019
b9ade5c
Fix datetime strings in populated.sql test database
emiliom Apr 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion odm2api/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
82 changes: 41 additions & 41 deletions tests/test_odm2/data/populated.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 4 additions & 2 deletions tests/test_odm2/test_readservice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@

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

import sqlalchemy
from sqlalchemy.orm import class_mapper

skipif = pytest.mark.skipif

globals_vars = {}


Expand Down