From b2813fdeda790d84223c55fe24eaa86a74ba4caf Mon Sep 17 00:00:00 2001 From: Edwin Lunando Date: Sat, 23 Aug 2014 13:22:45 +0700 Subject: [PATCH 1/2] add mysql support --- .../migrations/versions/15e14062732d_create_users_table.py | 4 ++-- users/models.py | 2 +- users/test/test_app.py | 6 +++--- users/test/test_user.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/users/migrations/versions/15e14062732d_create_users_table.py b/users/migrations/versions/15e14062732d_create_users_table.py index 54c5689..e40c3da 100644 --- a/users/migrations/versions/15e14062732d_create_users_table.py +++ b/users/migrations/versions/15e14062732d_create_users_table.py @@ -23,8 +23,8 @@ def upgrade(): sa.Column("website", sa.String(255), default=""), sa.Column("email_updates", sa.Boolean(name="email_updates"), default=False), - sa.Column("date_added", sa.DateTime, - server_default=sa.text("CURRENT_TIMESTAMP")), + sa.Column("date_added", sa.TIMESTAMP, + server_default=sa.func.now()), sa.Column("latitude", sa.Float), sa.Column("longitude", sa.Float), ) diff --git a/users/models.py b/users/models.py index 351ccb0..cde316c 100644 --- a/users/models.py +++ b/users/models.py @@ -15,7 +15,7 @@ class User(db.Model): website = db.Column(db.String(255), default="") email_updates = db.Column(db.Boolean(name="email_updates"), default=False) - date_added = db.Column(db.DateTime, + date_added = db.Column(db.TIMESTAMP, server_default=db.text("CURRENT_TIMESTAMP")) latitude = db.Column(db.Float) longitude = db.Column(db.Float) diff --git a/users/test/test_app.py b/users/test/test_app.py index 493a7d1..e873d07 100644 --- a/users/test/test_app.py +++ b/users/test/test_app.py @@ -26,7 +26,7 @@ def setUp(self): name='Akbar', email='test@gmail.com', website='http://www.ac.com', - email_updates='true', + email_updates=True, latitude=12.32, longitude=-13.03, twitter="johndoe", @@ -36,7 +36,7 @@ def setUp(self): name='', email='testgmaicom', website='http://www.ac.com', - email_updates='true', + email_updates=True, latitude=12.32, longitude=-13.03, twitter="johndoe", @@ -46,7 +46,7 @@ def setUp(self): name='Akbar Gumbira', email='test@gmail.com', website='http://www.ac.com', - email_updates='true', + email_updates=True, latitude=12.32, longitude=-13.03, twitter="mrsmith", diff --git a/users/test/test_user.py b/users/test/test_user.py index aa8ea2e..723d22b 100644 --- a/users/test/test_user.py +++ b/users/test/test_user.py @@ -32,7 +32,7 @@ def setUp(self): name='Akbar', email='test@gmail.com', website='http://www.ac.com', - email_updates='true', + email_updates=True, latitude=12.32, longitude=-13.03, social_account=dict(twitter="johndoe"), @@ -68,7 +68,7 @@ def test_edit_user(self): name='Akbar Gumbira', email='gumbira@gmail.com', website='http://www.akbargumbira.com', - email_updates='true', + email_updates=True, latitude=-6.32, longitude=102.03) guid = edit_user(guid, **edited_data) From 09af702130a0d83fe6c0b0486821d1de677a9de0 Mon Sep 17 00:00:00 2001 From: Edwin Lunando Date: Sat, 23 Aug 2014 13:28:48 +0700 Subject: [PATCH 2/2] fix into CURRENT_TIMESTAMP --- users/migrations/versions/15e14062732d_create_users_table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/migrations/versions/15e14062732d_create_users_table.py b/users/migrations/versions/15e14062732d_create_users_table.py index e40c3da..dcf752c 100644 --- a/users/migrations/versions/15e14062732d_create_users_table.py +++ b/users/migrations/versions/15e14062732d_create_users_table.py @@ -24,7 +24,7 @@ def upgrade(): sa.Column("email_updates", sa.Boolean(name="email_updates"), default=False), sa.Column("date_added", sa.TIMESTAMP, - server_default=sa.func.now()), + server_default=sa.text("CURRENT_TIMESTAMP")), sa.Column("latitude", sa.Float), sa.Column("longitude", sa.Float), )