hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-15 22:13:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

add user.created and start last_activity as None

Browse Source 
need to handle last_activity being None throughout
This commit is contained in:
Min RK
2018-02-22 15:46:53 +01:00
parent 3e7d0dbd23
commit 8973dea33e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jupyterhub/alembic/versions/56cc5a70207e_token_tracking.py
View File

@@ -18,6 +18,7 @@ import sqlalchemy as sa
def upgrade(): def upgrade():
tables = op.get_bind().engine.table_names() tables = op.get_bind().engine.table_names()
op.add_column('users', sa.Column('created', sa.DateTime(), nullable=True))
op.add_column('api_tokens', sa.Column('created', sa.DateTime(), nullable=True)) op.add_column('api_tokens', sa.Column('created', sa.DateTime(), nullable=True))
op.add_column('api_tokens', sa.Column('last_activity', sa.DateTime(), nullable=True)) op.add_column('api_tokens', sa.Column('last_activity', sa.DateTime(), nullable=True))
op.add_column('api_tokens', sa.Column('note', sa.Unicode(length=1023), nullable=True)) op.add_column('api_tokens', sa.Column('note', sa.Unicode(length=1023), nullable=True))
@@ -31,6 +32,7 @@ def upgrade():
def downgrade(): def downgrade():
op.drop_constraint(None, 'oauth_codes', type_='foreignkey') op.drop_constraint(None, 'oauth_codes', type_='foreignkey')
op.drop_constraint(None, 'oauth_access_tokens', type_='foreignkey') op.drop_constraint(None, 'oauth_access_tokens', type_='foreignkey')
op.add_column('users', 'created')
op.drop_column('oauth_access_tokens', 'last_activity') op.drop_column('oauth_access_tokens', 'last_activity')
op.drop_column('oauth_access_tokens', 'created') op.drop_column('oauth_access_tokens', 'created')
op.drop_column('api_tokens', 'note') op.drop_column('api_tokens', 'note')

5
jupyterhub/orm.py
View File

@@ -134,7 +134,8 @@ class User(Base):
return {s.name: s for s in self._orm_spawners} return {s.name: s for s in self._orm_spawners}
admin = Column(Boolean, default=False) admin = Column(Boolean, default=False)
last_activity = Column(DateTime, default=datetime.utcnow) created = Column(DateTime, default=datetime.utcnow)
last_activity = Column(DateTime, nullable=True)
api_tokens = relationship("APIToken", backref="user") api_tokens = relationship("APIToken", backref="user")
cookie_id = Column(Unicode(255), default=new_token, nullable=False, unique=True) cookie_id = Column(Unicode(255), default=new_token, nullable=False, unique=True)
@@ -182,7 +183,7 @@ class Spawner(Base):
state = Column(JSONDict) state = Column(JSONDict)
name = Column(Unicode(255)) name = Column(Unicode(255))
last_activity = Column(DateTime, default=datetime.utcnow) last_activity = Column(DateTime, nullable=True)
class Service(Base): class Service(Base):