Skip to content

fix: Use SQLAlchemy in-built timestamp function #5948

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

Merged
merged 4 commits into from
May 22, 2019
Merged

fix: Use SQLAlchemy in-built timestamp function #5948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d57a11
Use SqlAlchemy Inbuild timestamp function
prateekj117 May 22, 2019
e9ab2e8
Use SqlAlchemy Inbuild timestamp function in session models
prateekj117 May 22, 2019
1c78cd8
Give proper name to sql.func package
prateekj117 May 22, 2019
b59e85c
Merge branch 'development' into timestamp-error
iamareebjamal May 22, 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
3 changes: 2 additions & 1 deletion app/models/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import pytz
from sqlalchemy import event, func
from sqlalchemy.sql import func as sql_func

from app.models import db
from app.models.base import SoftDeletionModel
Expand Down Expand Up @@ -46,7 +47,7 @@ class Session(SoftDeletionModel):
event_id = db.Column(db.Integer, db.ForeignKey('events.id', ondelete='CASCADE'))
creator_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE'))
state = db.Column(db.String, default="pending")
created_at = db.Column(db.DateTime(timezone=True), default=datetime.datetime.utcnow)
created_at = db.Column(db.DateTime(timezone=True), default=sql_func.now())
submitted_at = db.Column(db.DateTime(timezone=True))
submission_modifier = db.Column(db.String)
is_mail_sent = db.Column(db.Boolean, default=False)
Expand Down
3 changes: 2 additions & 1 deletion app/models/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from flask_scrypt import generate_password_hash, generate_random_salt
from sqlalchemy import event, desc
from sqlalchemy.ext.hybrid import hybrid_property
from sqlalchemy.sql import func
from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound

from app.api.helpers.db import get_count
Expand Down Expand Up @@ -77,7 +78,7 @@ class User(SoftDeletionModel):
is_verified = db.Column(db.Boolean, default=False)
was_registered_with_order = db.Column(db.Boolean, default=False)
last_accessed_at = db.Column(db.DateTime(timezone=True))
created_at = db.Column(db.DateTime(timezone=True), default=datetime.now(pytz.utc))
created_at = db.Column(db.DateTime(timezone=True), default=func.now())
speaker = db.relationship('Speaker', backref="user")
favourite_events = db.relationship('UserFavouriteEvent', backref="user")
session = db.relationship('Session', backref="user")
Expand Down