From f1eb3f68d186c39e5a5920257b13157f04118fd1 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 7 May 2017 11:35:26 -0400 Subject: [PATCH] Change func.now() to datetime.datetime.now(). Apparently these are calculated differently (sqlite function is in utc, datetime is in local), and I couldn't figure out how to retrieve the tiome back into local. Since this is a single user application without a concern for time drift on the server, this should work just as well. --- eos/db/saveddata/booster.py | 6 +++--- eos/db/saveddata/cargo.py | 6 +++--- eos/db/saveddata/character.py | 6 +++--- eos/db/saveddata/crest.py | 4 ++-- eos/db/saveddata/damagePattern.py | 6 +++--- eos/db/saveddata/drone.py | 6 +++--- eos/db/saveddata/fighter.py | 6 +++--- eos/db/saveddata/fit.py | 14 +++++++------- eos/db/saveddata/implant.py | 6 +++--- eos/db/saveddata/implantSet.py | 6 +++--- eos/db/saveddata/module.py | 6 +++--- eos/db/saveddata/override.py | 6 +++--- eos/db/saveddata/skill.py | 6 +++--- eos/db/saveddata/targetResists.py | 6 +++--- 14 files changed, 45 insertions(+), 45 deletions(-) diff --git a/eos/db/saveddata/booster.py b/eos/db/saveddata/booster.py index 518bca003..e40762cd9 100644 --- a/eos/db/saveddata/booster.py +++ b/eos/db/saveddata/booster.py @@ -20,7 +20,7 @@ from sqlalchemy import Table, Column, ForeignKey, Integer, Boolean, DateTime from sqlalchemy.ext.associationproxy import association_proxy from sqlalchemy.orm import mapper, relation -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.saveddata.booster import Booster @@ -30,8 +30,8 @@ boosters_table = Table("boosters", saveddata_meta, Column("itemID", Integer), Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False), Column("active", Boolean), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()), + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now), ) # Legacy booster side effect code, should disable but a mapper relies on it. diff --git a/eos/db/saveddata/cargo.py b/eos/db/saveddata/cargo.py index ce24dd48c..b9b23adaf 100644 --- a/eos/db/saveddata/cargo.py +++ b/eos/db/saveddata/cargo.py @@ -19,7 +19,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, DateTime from sqlalchemy.orm import mapper, relation -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.saveddata.cargo import Cargo @@ -30,8 +30,8 @@ cargo_table = Table("cargo", saveddata_meta, Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True), Column("itemID", Integer, nullable=False), Column("amount", Integer, nullable=False), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()), + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now), ) mapper(Cargo, cargo_table, diff --git a/eos/db/saveddata/character.py b/eos/db/saveddata/character.py index 61c57b827..4901216ef 100644 --- a/eos/db/saveddata/character.py +++ b/eos/db/saveddata/character.py @@ -19,7 +19,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, String, DateTime from sqlalchemy.orm import relation, mapper -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.db.saveddata.implant import charImplants_table @@ -38,8 +38,8 @@ characters_table = Table("characters", saveddata_meta, Column("defaultLevel", Integer, nullable=True), Column("alphaCloneID", Integer, nullable=True), Column("ownerID", ForeignKey("users.ID"), nullable=True), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now())) + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)) mapper(Character, characters_table, properties={ diff --git a/eos/db/saveddata/crest.py b/eos/db/saveddata/crest.py index fff78a3ee..28f77a983 100644 --- a/eos/db/saveddata/crest.py +++ b/eos/db/saveddata/crest.py @@ -19,7 +19,7 @@ from sqlalchemy import Table, Column, Integer, String, DateTime from sqlalchemy.orm import mapper -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.saveddata.crestchar import CrestChar @@ -29,6 +29,6 @@ crest_table = Table("crest", saveddata_meta, Column("name", String, nullable=False, unique=True), Column("refresh_token", String, nullable=False), # These records aren't updated. Instead, they are dropped and created, hence we don't have a modified field - Column("created", DateTime, nullable=True, default=func.now())) + Column("created", DateTime, nullable=True, default=datetime.datetime.now)) mapper(CrestChar, crest_table) diff --git a/eos/db/saveddata/damagePattern.py b/eos/db/saveddata/damagePattern.py index 6f20cd92f..8a2536703 100644 --- a/eos/db/saveddata/damagePattern.py +++ b/eos/db/saveddata/damagePattern.py @@ -19,7 +19,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, String, DateTime from sqlalchemy.orm import mapper -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.saveddata.damagePattern import DamagePattern @@ -32,8 +32,8 @@ damagePatterns_table = Table("damagePatterns", saveddata_meta, Column("kineticAmount", Integer), Column("explosiveAmount", Integer), Column("ownerID", ForeignKey("users.ID"), nullable=True), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()) + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now) ) mapper(DamagePattern, damagePatterns_table) diff --git a/eos/db/saveddata/drone.py b/eos/db/saveddata/drone.py index d59c15fbe..b4c0cefb9 100644 --- a/eos/db/saveddata/drone.py +++ b/eos/db/saveddata/drone.py @@ -19,7 +19,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean, DateTime from sqlalchemy.orm import mapper, relation -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.saveddata.drone import Drone @@ -32,8 +32,8 @@ drones_table = Table("drones", saveddata_meta, Column("amount", Integer, nullable=False), Column("amountActive", Integer, nullable=False), Column("projected", Boolean, default=False), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()) + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now) ) mapper(Drone, drones_table, diff --git a/eos/db/saveddata/fighter.py b/eos/db/saveddata/fighter.py index e20e9fbdf..bb1ed133f 100644 --- a/eos/db/saveddata/fighter.py +++ b/eos/db/saveddata/fighter.py @@ -19,7 +19,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean, DateTime from sqlalchemy.orm import mapper, relation -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.saveddata.fighterAbility import FighterAbility @@ -33,8 +33,8 @@ fighters_table = Table("fighters", saveddata_meta, Column("active", Boolean, nullable=True), Column("amount", Integer, nullable=False), Column("projected", Boolean, default=False), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()) + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now) ) fighter_abilities_table = Table("fightersAbilities", saveddata_meta, diff --git a/eos/db/saveddata/fit.py b/eos/db/saveddata/fit.py index 372d230f4..7f8fdbe61 100644 --- a/eos/db/saveddata/fit.py +++ b/eos/db/saveddata/fit.py @@ -22,7 +22,7 @@ from sqlalchemy.orm.collections import attribute_mapped_collection from sqlalchemy.sql import and_ from sqlalchemy.orm import relation, reconstructor, mapper, relationship from sqlalchemy import ForeignKey, Column, Integer, String, Table, Boolean, DateTime -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.db import saveddata_session @@ -59,8 +59,8 @@ fits_table = Table("fits", saveddata_meta, Column("implantLocation", Integer, nullable=False, default=ImplantLocation.FIT), Column("notes", String, nullable=True), Column("ignoreRestrictions", Boolean, default=0), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, default=func.now(), onupdate=func.now()) + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, default=datetime.datetime.now, onupdate=datetime.datetime.now) ) projectedFits_table = Table("projectedFits", saveddata_meta, @@ -68,16 +68,16 @@ projectedFits_table = Table("projectedFits", saveddata_meta, Column("victimID", ForeignKey("fits.ID"), primary_key=True), Column("amount", Integer, nullable=False, default=1), Column("active", Boolean, nullable=False, default=1), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()) + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now) ) commandFits_table = Table("commandFits", saveddata_meta, Column("boosterID", ForeignKey("fits.ID"), primary_key=True), Column("boostedID", ForeignKey("fits.ID"), primary_key=True), Column("active", Boolean, nullable=False, default=1), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()) + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now) ) diff --git a/eos/db/saveddata/implant.py b/eos/db/saveddata/implant.py index e1f1632c4..edf9aac12 100644 --- a/eos/db/saveddata/implant.py +++ b/eos/db/saveddata/implant.py @@ -19,7 +19,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean, DateTime from sqlalchemy.orm import mapper -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.saveddata.implant import Implant @@ -28,8 +28,8 @@ implants_table = Table("implants", saveddata_meta, Column("ID", Integer, primary_key=True), Column("itemID", Integer), Column("active", Boolean), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()) + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now) ) fitImplants_table = Table("fitImplants", saveddata_meta, diff --git a/eos/db/saveddata/implantSet.py b/eos/db/saveddata/implantSet.py index c32700740..369f04760 100644 --- a/eos/db/saveddata/implantSet.py +++ b/eos/db/saveddata/implantSet.py @@ -19,7 +19,7 @@ from sqlalchemy import Table, Column, Integer, String, DateTime from sqlalchemy.orm import relation, mapper -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.db.saveddata.implant import implantsSetMap_table @@ -30,8 +30,8 @@ from eos.saveddata.implantSet import ImplantSet implant_set_table = Table("implantSets", saveddata_meta, Column("ID", Integer, primary_key=True), Column("name", String, nullable=False), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()) + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now) ) mapper(ImplantSet, implant_set_table, diff --git a/eos/db/saveddata/module.py b/eos/db/saveddata/module.py index fbbf9332a..704eca99d 100644 --- a/eos/db/saveddata/module.py +++ b/eos/db/saveddata/module.py @@ -19,7 +19,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, CheckConstraint, Boolean, DateTime, select from sqlalchemy.orm import relation, mapper -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.saveddata.module import Module @@ -34,8 +34,8 @@ modules_table = Table("modules", saveddata_meta, Column("state", Integer, CheckConstraint("state >= -1"), CheckConstraint("state <= 2")), Column("projected", Boolean, default=False, nullable=False), Column("position", Integer), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()), + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now), CheckConstraint('("dummySlot" = NULL OR "itemID" = NULL) AND "dummySlot" != "itemID"')) mapper(Module, modules_table, diff --git a/eos/db/saveddata/override.py b/eos/db/saveddata/override.py index ed3288405..aa99c9763 100644 --- a/eos/db/saveddata/override.py +++ b/eos/db/saveddata/override.py @@ -19,7 +19,7 @@ from sqlalchemy import Table, Column, Integer, Float, DateTime from sqlalchemy.orm import mapper -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.saveddata.override import Override @@ -28,8 +28,8 @@ overrides_table = Table("overrides", saveddata_meta, Column("itemID", Integer, primary_key=True, index=True), Column("attrID", Integer, primary_key=True, index=True), Column("value", Float, nullable=False), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()) + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now) ) mapper(Override, overrides_table) diff --git a/eos/db/saveddata/skill.py b/eos/db/saveddata/skill.py index 40192def9..5e56f2cdb 100644 --- a/eos/db/saveddata/skill.py +++ b/eos/db/saveddata/skill.py @@ -19,7 +19,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, DateTime from sqlalchemy.orm import mapper -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.saveddata.character import Skill @@ -29,8 +29,8 @@ skills_table = Table("characterSkills", saveddata_meta, Column("characterID", ForeignKey("characters.ID"), primary_key=True, index=True), Column("itemID", Integer, primary_key=True), Column("_Skill__level", Integer, nullable=True), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()) + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now) ) mapper(Skill, skills_table) diff --git a/eos/db/saveddata/targetResists.py b/eos/db/saveddata/targetResists.py index bda30405d..f100bc2dd 100644 --- a/eos/db/saveddata/targetResists.py +++ b/eos/db/saveddata/targetResists.py @@ -19,7 +19,7 @@ from sqlalchemy import Table, Column, Integer, Float, ForeignKey, String, DateTime from sqlalchemy.orm import mapper -import sqlalchemy.sql.functions as func +import datetime from eos.db import saveddata_meta from eos.saveddata.targetResists import TargetResists @@ -32,8 +32,8 @@ targetResists_table = Table("targetResists", saveddata_meta, Column("kineticAmount", Float), Column("explosiveAmount", Float), Column("ownerID", ForeignKey("users.ID"), nullable=True), - Column("created", DateTime, nullable=True, default=func.now()), - Column("modified", DateTime, nullable=True, onupdate=func.now()) + Column("created", DateTime, nullable=True, default=datetime.datetime.now), + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now) ) mapper(TargetResists, targetResists_table)