[copr] master: Provide, initial values for not-null columns, fix the migration to work. Alembic currently doesn't support adding default values for date columns (340d05a)

Repository : http://git.fedorahosted.org/cgit/copr.git

On branch  : master

> ---------------------------------------------------------------
commit 340d05a69142e867662d24523db71e177a66ef0e
Author: Bohuslav Kabrda <bkabrda(a)redhat.com&gt;
Date:   Tue Jan 8 13:14:09 2013 +0100

    Provide, initial values for not-null columns, fix the migration to work.
    Alembic currently doesn't support adding default values for date columns


> ---------------------------------------------------------------
 .../versions/32ba137a3d56_add_token_informatio.py  |    5 +++--
 coprs_frontend/coprs/models.py                     |    6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/coprs_frontend/alembic/versions/32ba137a3d56_add_token_informatio.py
b/coprs_frontend/alembic/versions/32ba137a3d56_add_token_informatio.py
index 64c7515..43451a9 100644
--- a/coprs_frontend/alembic/versions/32ba137a3d56_add_token_informatio.py
+++ b/coprs_frontend/alembic/versions/32ba137a3d56_add_token_informatio.py
@@ -20,9 +20,10 @@ def upgrade():
     """ Add the coluns api_token and api_token_expiration to the user
table.
     """
     op.add_column('user', sa.Column('api_token', sa.String(40),
-        nullable=False), default='default_token')
+        nullable=False, server_default='default_token'))
     op.add_column('user', sa.Column('api_token_expiration', sa.Date,
-        nullable=False, default=datetime.date(2000, 1, 1)))
+        nullable=False, server_default='2000-1-1'))
+
 
 
 def downgrade():
diff --git a/coprs_frontend/coprs/models.py b/coprs_frontend/coprs/models.py
index 4429554..c7120a1 100644
--- a/coprs_frontend/coprs/models.py
+++ b/coprs_frontend/coprs/models.py
@@ -1,3 +1,5 @@
+import datetime
+
 from coprs import constants
 from coprs import db
 from coprs import helpers
@@ -54,8 +56,8 @@ class User(db.Model, Serializer):
     mail = db.Column(db.String(150), nullable = False)
     proven = db.Column(db.Boolean, default = False)
     admin = db.Column(db.Boolean, default = False)
-    api_token = db.Column(db.String(40), nullable = False)
-    api_token_expiration = db.Column(db.Date, nullable = False)
+    api_token = db.Column(db.String(40), nullable = False, default = 'abc')
+    api_token_expiration = db.Column(db.Date, nullable = False, default =
datetime.date(2000, 1, 1))
 
     @property
     def name(self):